summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.184.43-1].vespa-6.184.43-1by-screwdriver2017-12-134-1/+2
* Merge pull request #4416 from vespa-engine/revert-4385-bjorncs/retrieve-athen...Arnstein Ressem2017-12-119-291/+9
|\
| * Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient"Arnstein Ressem2017-12-119-291/+9
|/
* Merge pull request #4414 from vespa-engine/revert-4412-revert-4405-hmusum/use...Harald Musum2017-12-111-1/+1
|\
| * Revert "Revert "Use chunked transfer in file distribution by default""Henning Baldersheim2017-12-111-1/+1
|/
* Merge pull request #4413 from vespa-engine/balder/implement-chunked-send-2Henning Baldersheim2017-12-112-11/+1
|\
| * Can not use referencedir as storage for temporary files.Henning Baldersheim2017-12-111-1/+1
| * Remove duplicate unused code.Henning Baldersheim2017-12-111-10/+0
|/
* Merge pull request #4412 from vespa-engine/revert-4405-hmusum/use-chunked-tra...Harald Musum2017-12-111-1/+1
|\
| * Revert "Use chunked transfer in file distribution by default"Harald Musum2017-12-111-1/+1
|/
* Merge pull request #4411 from vespa-engine/bjorncs/custom-sslcontextBjørn Christian Seime2017-12-111-2/+25
|\
| * Allow custom SSLContext and user agentBjørn Christian Seime2017-12-111-2/+25
* | Merge pull request #4410 from vespa-engine/toregge/use-standard-locking-in-se...Tor Brede Vekterli2017-12-1123-70/+82
|\ \
| * | Remove unused includes.Tor Egge2017-12-119-8/+2
| * | Use standard locking in searchcore (pass 2).Tor Egge2017-12-115-26/+40
| * | Use standard locking in searchcore (pass 1).Tor Egge2017-12-1111-36/+40
|/ /
* | Merge pull request #4407 from vespa-engine/toregge/use-standard-locking-in-pr...Tor Brede Vekterli2017-12-118-32/+42
|\ \
| * | Use standard locking in searchcore/proton/server (pass 2).Tor Egge2017-12-118-32/+42
* | | Merge pull request #4408 from vespa-engine/mpolden/enable-dns-updateMartin Polden2017-12-113-6/+3
|\ \ \ | |_|/ |/| |
| * | Reduce maintenance interval for debugging purposesMartin Polden2017-12-111-1/+1
| * | Revert "Log DNS update"Martin Polden2017-12-112-5/+2
* | | Merge pull request #4409 from vespa-engine/hmusum/reduce-log-levelsHenning Baldersheim2017-12-113-16/+8
|\ \ \
| * | | Reduce log level for some messagesHarald Musum2017-12-113-16/+8
* | | | Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-certBjørn Christian Seime2017-12-119-9/+291
|\ \ \ \
| * | | | Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-113-0/+100
| * | | | Make credentials expiry configurableBjørn Christian Seime2017-12-083-6/+14
| * | | | Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-077-6/+180
* | | | | Merge pull request #4398 from vespa-engine/jvenstad/zone-cleanpuJon Marius Venstad2017-12-1143-241/+302
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | More Zone -> ZoneIdJon Marius Venstad2017-12-111-2/+2
| * | | | Changed to ZoneId in DnsMaintainerTest as wellJon Marius Venstad2017-12-111-2/+3
| * | | | Need to change new code as wellJon Marius Venstad2017-12-1148-142/+905
| |\ \ \ \
| * | | | | Some doc, cleanup of modifiers and @Override, a TODOJon Marius Venstad2017-12-113-6/+10
| * | | | | Fixed scala typeJon Marius Venstad2017-12-082-4/+6
| * | | | | Replaced inheritance with delegationJon Marius Venstad2017-12-085-14/+44
| * | | | | Remove unused ZoneIdJon Marius Venstad2017-12-081-13/+0
| * | | | | Replace constructor with factoriesJon Marius Venstad2017-12-0817-58/+50
| * | | | | Replaced Zone with ZoneId two places where only that part was usedJon Marius Venstad2017-12-085-36/+32
| * | | | | Replaced instantiation of Zone with ZoneId where applicableJon Marius Venstad2017-12-0820-68/+72
| * | | | | Freshed up ZoneIdJon Marius Venstad2017-12-082-16/+48
| * | | | | Extract superclass with environment and regionJon Marius Venstad2017-12-0823-105/+123
| * | | | | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-0839-125/+123
| * | | | | Factory constructor with region/envJon Marius Venstad2017-12-0839-123/+125
| * | | | | Inline and streamline Zone constructorsJon Marius Venstad2017-12-081-7/+2
* | | | | | Merge pull request #4406 from vespa-engine/toregge/use-standard-locking-in-pr...Tor Brede Vekterli2017-12-119-27/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use standard locking in searchcore/proton/server (pass 1).Tor Egge2017-12-119-27/+24
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4404 from vespa-engine/toregge/remove-inlining-warning-on...Tor Brede Vekterli2017-12-112-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't inline FieldExprNode destructor.Tor Egge2017-12-112-1/+3
| |/ / /
* | | | Merge pull request #4405 from vespa-engine/hmusum/use-chunked-transfer-by-def...Henning Baldersheim2017-12-111-1/+1
|\ \ \ \
| * | | | Use chunked transfer in file distribution by defaultHarald Musum2017-12-111-1/+1
|/ / / /
* | | | Merge pull request #4316 from vespa-engine/bjorncs/jetty-9.4.8Bjørn Christian Seime2017-12-113-6/+7
|\ \ \ \ | |/ / / |/| | |