summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change log level and message when getting file not requestedHarald Musum2018-01-031-1/+1
* Merge pull request #4486 from vespa-engine/bjorncs/config-server-client-with-tlsMorten Tokle2018-01-038-19/+85
|\
| * Use TLS with Athenz in ConfigServerRestExecutorBjørn Christian Seime2018-01-032-8/+33
| * Provide Athenz identity of configservers in ZoneRegistryBjørn Christian Seime2018-01-032-0/+9
| * Implement Apache Http verifier interface in AthenzIdentityVerifierBjørn Christian Seime2018-01-031-4/+32
| * Use https endpoint on config serverBjørn Christian Seime2018-01-033-7/+11
|/
* Merge pull request #4541 from vespa-engine/vekterli/always-set-doctype-repoHenning Baldersheim2018-01-032-0/+29
|\
| * Always set document type repo during deserializationTor Brede Vekterli2018-01-032-0/+29
* | Merge pull request #4519 from vespa-engine/hakonhall/only-dockeroperations-de...Håkon Hallingstad2018-01-035-14/+14
|\ \
| * | Only DockerOperations depends on Docker interfaceHåkon Hallingstad2017-12-225-14/+14
* | | Merge pull request #4540 from vespa-engine/jvenstad/zone-cleanup-4-3Jon Marius Venstad2018-01-0346-120/+218
|\ \ \
| * | | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-0346-120/+218
|/ / /
* | | Merge pull request #4539 from vespa-engine/hmusum/fix-testHenning Baldersheim2018-01-031-1/+1
|\ \ \
| * | | Don't test for exact version, just that we get oneHarald Musum2018-01-031-1/+1
|/ / /
* | | Merge pull request #4535 from vespa-engine/hmusum/rewrite-status-handlerJon Bratseth2018-01-038-201/+98
|\ \ \
| * | | Ad some javadoc and do some minor tweaksHarald Musum2018-01-032-21/+16
| * | | No need to override methods that the superclass does correctlyHarald Musum2018-01-021-9/+0
| * | | Rewrite status handlerHarald Musum2018-01-028-201/+112
| | |/ | |/|
* | | Merge pull request #4536 from vespa-engine/revert-4534-revert-4533-revert-445...Harald Musum2018-01-0246-218/+120
|\ \ \
| * | | Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-0246-218/+120
|/ / /
* | | Merge pull request #4531 from vespa-engine/revert-4521-revert-4516-hakonhall/...Håkon Hallingstad2018-01-027-86/+231
|\ \ \
| * | | Call start once and avoid stop without startHåkon Hallingstad2018-01-021-7/+10
| * | | Revert "Revert "Support node admin modes""Håkon Hallingstad2018-01-027-86/+228
* | | | Merge pull request #4534 from vespa-engine/revert-4533-revert-4453-jvenstad/z...Jon Marius Venstad2018-01-0246-120/+218
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-0246-120/+218
|/ / /
* | | Merge pull request #4533 from vespa-engine/revert-4453-jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0246-218/+120
|\ \ \
| * | | Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0246-218/+120
|/ / /
* | | Merge pull request #4453 from vespa-engine/jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0246-120/+218
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-02316-2023/+9650
| |\ \ | |/ / |/| |
* | | Merge pull request #4530 from vespa-engine/hmusum/delete-temp-file-if-move-failsHenning Baldersheim2018-01-011-1/+4
|\ \ \
| * | | Delete temp file if move fails because file already existsHarald Musum2018-01-011-1/+4
|/ / /
* | | Merge pull request #4529 from vespa-engine/balder/inline-frequently-called-me...Henning Baldersheim2017-12-2915-37/+40
|\ \ \
| * | | Let implementation be visible too.Henning Baldersheim2017-12-295-3/+6
| * | | Must see implementation too.Henning Baldersheim2017-12-292-0/+2
| * | | Include implementation file too.Henning Baldersheim2017-12-291-4/+3
| * | | InlineHenning Baldersheim2017-12-292-8/+3
| * | | Ensure methods are inlined.Henning Baldersheim2017-12-293-9/+7
| * | | Also copy the zero termination.Henning Baldersheim2017-12-291-1/+1
| * | | Avoid all the plt indirections by declaring dll local and using simpler struc...Henning Baldersheim2017-12-294-14/+20
|/ / /
* | | Merge pull request #4526 from vespa-engine/balder/use-faster-iterationHenning Baldersheim2017-12-2912-76/+71
|\ \ \
| * | | Do not include the world by default.Henning Baldersheim2017-12-287-6/+8
| * | | Expect the happy path.Henning Baldersheim2017-12-281-4/+4
| * | | Cancel unintended change.Henning Baldersheim2017-12-281-1/+1
| * | | Must generate the hash before the object is invalidHenning Baldersheim2017-12-281-1/+2
| * | | Make constructor explicit.Henning Baldersheim2017-12-282-3/+2
| * | | Use a faster and simpler iteration for speed and simplicity.Henning Baldersheim2017-12-284-64/+57
* | | | Merge pull request #4527 from vespa-engine/balder/avoid-parts-of-the-world-onlyHenning Baldersheim2017-12-2929-201/+122
|\ \ \ \
| * | | | Do not include the world.Henning Baldersheim2017-12-2929-201/+122
| |/ / /
* | | | Merge pull request #4528 from vespa-engine/hmusum/delete-file-if-writing-failsHenning Baldersheim2017-12-291-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Delete inprogress file if write is not successfulHarald Musum2017-12-291-1/+2