Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4416 from ↵ | Arnstein Ressem | 2017-12-11 | 9 | -291/+9 |
|\ | | | | | | | | | vespa-engine/revert-4385-bjorncs/retrieve-athenz-tls-cert Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient" | ||||
| * | Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient" | Arnstein Ressem | 2017-12-11 | 9 | -291/+9 |
|/ | |||||
* | Merge pull request #4414 from ↵ | Harald Musum | 2017-12-11 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/revert-4412-revert-4405-hmusum/use-chunked-transfer-by-default Revert "Revert "Use chunked transfer in file distribution by default"" | ||||
| * | Revert "Revert "Use chunked transfer in file distribution by default"" | Henning Baldersheim | 2017-12-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4413 from vespa-engine/balder/implement-chunked-send-2 | Henning Baldersheim | 2017-12-11 | 2 | -11/+1 |
|\ | | | | | Balder/implement chunked send 2 | ||||
| * | Can not use referencedir as storage for temporary files. | Henning Baldersheim | 2017-12-11 | 1 | -1/+1 |
| | | | | | | | | Use parent dir instead. That will be on same FS hence the move will atomic. | ||||
| * | Remove duplicate unused code. | Henning Baldersheim | 2017-12-11 | 1 | -10/+0 |
|/ | |||||
* | Merge pull request #4412 from ↵ | Harald Musum | 2017-12-11 | 1 | -1/+1 |
|\ | | | | | | | | | vespa-engine/revert-4405-hmusum/use-chunked-transfer-by-default Revert "Use chunked transfer in file distribution by default" | ||||
| * | Revert "Use chunked transfer in file distribution by default" | Harald Musum | 2017-12-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4411 from vespa-engine/bjorncs/custom-sslcontext | Bjørn Christian Seime | 2017-12-11 | 1 | -2/+25 |
|\ | | | | | Allow custom SSLContext and user agent | ||||
| * | Allow custom SSLContext and user agent | Bjørn Christian Seime | 2017-12-11 | 1 | -2/+25 |
| | | |||||
* | | Merge pull request #4410 from ↵ | Tor Brede Vekterli | 2017-12-11 | 23 | -70/+82 |
|\ \ | | | | | | | | | | | | | vespa-engine/toregge/use-standard-locking-in-searchcore Toregge/use standard locking in searchcore | ||||
| * | | Remove unused includes. | Tor Egge | 2017-12-11 | 9 | -8/+2 |
| | | | |||||
| * | | Use standard locking in searchcore (pass 2). | Tor Egge | 2017-12-11 | 5 | -26/+40 |
| | | | |||||
| * | | Use standard locking in searchcore (pass 1). | Tor Egge | 2017-12-11 | 11 | -36/+40 |
|/ / | |||||
* | | Merge pull request #4407 from ↵ | Tor Brede Vekterli | 2017-12-11 | 8 | -32/+42 |
|\ \ | | | | | | | | | | | | | vespa-engine/toregge/use-standard-locking-in-proton-server-files-pass2 Use standard locking in searchcore/proton/server (pass 2). | ||||
| * | | Use standard locking in searchcore/proton/server (pass 2). | Tor Egge | 2017-12-11 | 8 | -32/+42 |
| | | | |||||
* | | | Merge pull request #4408 from vespa-engine/mpolden/enable-dns-update | Martin Polden | 2017-12-11 | 3 | -6/+3 |
|\ \ \ | |_|/ |/| | | Enable DNS update | ||||
| * | | Reduce maintenance interval for debugging purposes | Martin Polden | 2017-12-11 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Log DNS update" | Martin Polden | 2017-12-11 | 2 | -5/+2 |
| | | | | | | | | | | | | This reverts commit adae0a8419978d3bc9f0a752d89fd8abc95718e1. | ||||
* | | | Merge pull request #4409 from vespa-engine/hmusum/reduce-log-levels | Henning Baldersheim | 2017-12-11 | 3 | -16/+8 |
|\ \ \ | | | | | | | | | Reduce log level for some messages | ||||
| * | | | Reduce log level for some messages | Harald Musum | 2017-12-11 | 3 | -16/+8 |
| | | | | |||||
* | | | | Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-cert | Bjørn Christian Seime | 2017-12-11 | 9 | -9/+291 |
|\ \ \ \ | | | | | | | | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | ||||
| * | | | | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-11 | 3 | -0/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | ||||
| * | | | | Make credentials expiry configurable | Bjørn Christian Seime | 2017-12-08 | 3 | -6/+14 |
| | | | | | |||||
| * | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-07 | 7 | -6/+180 |
| | | | | | |||||
* | | | | | Merge pull request #4398 from vespa-engine/jvenstad/zone-cleanpu | Jon Marius Venstad | 2017-12-11 | 43 | -241/+302 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Jvenstad/zone cleanpu | ||||
| * | | | | More Zone -> ZoneId | Jon Marius Venstad | 2017-12-11 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Changed to ZoneId in DnsMaintainerTest as well | Jon Marius Venstad | 2017-12-11 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Need to change new code as well | Jon Marius Venstad | 2017-12-11 | 48 | -142/+905 |
| |\ \ \ \ | |||||
| * | | | | | Some doc, cleanup of modifiers and @Override, a TODO | Jon Marius Venstad | 2017-12-11 | 3 | -6/+10 |
| | | | | | | |||||
| * | | | | | Fixed scala type | Jon Marius Venstad | 2017-12-08 | 2 | -4/+6 |
| | | | | | | |||||
| * | | | | | Replaced inheritance with delegation | Jon Marius Venstad | 2017-12-08 | 5 | -14/+44 |
| | | | | | | |||||
| * | | | | | Remove unused ZoneId | Jon Marius Venstad | 2017-12-08 | 1 | -13/+0 |
| | | | | | | |||||
| * | | | | | Replace constructor with factories | Jon Marius Venstad | 2017-12-08 | 17 | -58/+50 |
| | | | | | | |||||
| * | | | | | Replaced Zone with ZoneId two places where only that part was used | Jon Marius Venstad | 2017-12-08 | 5 | -36/+32 |
| | | | | | | |||||
| * | | | | | Replaced instantiation of Zone with ZoneId where applicable | Jon Marius Venstad | 2017-12-08 | 20 | -68/+72 |
| | | | | | | |||||
| * | | | | | Freshed up ZoneId | Jon Marius Venstad | 2017-12-08 | 2 | -16/+48 |
| | | | | | | |||||
| * | | | | | Extract superclass with environment and region | Jon Marius Venstad | 2017-12-08 | 23 | -105/+123 |
| | | | | | | |||||
| * | | | | | Revert "Factory constructor with region/env" | Jon Marius Venstad | 2017-12-08 | 39 | -125/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f2b434d614b49bef40038ec1fe1d391db62e1e. | ||||
| * | | | | | Factory constructor with region/env | Jon Marius Venstad | 2017-12-08 | 39 | -123/+125 |
| | | | | | | |||||
| * | | | | | Inline and streamline Zone constructors | Jon Marius Venstad | 2017-12-08 | 1 | -7/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #4406 from ↵ | Tor Brede Vekterli | 2017-12-11 | 9 | -27/+24 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | vespa-engine/toregge/use-standard-locking-in-proton-server-files-pass1 Use standard locking in searchcore/proton/server (pass 1). | ||||
| * | | | | | Use standard locking in searchcore/proton/server (pass 1). | Tor Egge | 2017-12-11 | 9 | -27/+24 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4404 from ↵ | Tor Brede Vekterli | 2017-12-11 | 2 | -1/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | vespa-engine/toregge/remove-inlining-warning-on-fedora-26 Don't inline FieldExprNode destructor. | ||||
| * | | | | Don't inline FieldExprNode destructor. | Tor Egge | 2017-12-11 | 2 | -1/+3 |
| |/ / / | |||||
* | | | | Merge pull request #4405 from ↵ | Henning Baldersheim | 2017-12-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-chunked-transfer-by-default Use chunked transfer in file distribution by default | ||||
| * | | | | Use chunked transfer in file distribution by default | Harald Musum | 2017-12-11 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4316 from vespa-engine/bjorncs/jetty-9.4.8 | Bjørn Christian Seime | 2017-12-11 | 3 | -6/+7 |
|\ \ \ \ | |/ / / |/| | | | Use Jetty v9.4.8 | ||||
| * | | | Use Jetty v9.4.8 | Bjørn Christian Seime | 2017-12-08 | 3 | -6/+7 |
| | |/ | |/| | | | | | | | | | | Upgrade to newest Jetty and add support for empty HTTP header values. Release notes Jetty: http://dev.eclipse.org/mhonarc/lists/jetty-announce/msg00114.html |