summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use httpclient version matching zts-client"Bjørn Christian Seime2018-01-053-5/+49
* Merge pull request #4538 from vespa-engine/balder/fast-for_eachHenning Baldersheim2018-01-048-8/+52
|\
| * Add a comment for rationale.Henning Baldersheim2018-01-033-0/+5
| * Add a test for for_eachHenning Baldersheim2018-01-033-7/+27
| * Add a for_each method for more efficient iteration.Henning Baldersheim2018-01-036-4/+23
* | Merge pull request #4552 from vespa-engine/bjorncs/controller-server-apache-h...Bjørn Christian Seime2018-01-043-49/+5
|\ \
| * | Use httpclient version matching zts-clientBjørn Christian Seime2018-01-043-49/+5
* | | Merge pull request #4554 from vespa-engine/freva/manually-resolve-remoteBjørn Christian Seime2018-01-041-1/+10
|\ \ \ | |/ / |/| |
| * | Manually resolve remoteValerij Fredriksen2018-01-041-1/+10
* | | Merge pull request #4551 from vespa-engine/bjorncs/osgi-painkillerMorten Tokle2018-01-043-35/+50
|\ \ \ | |/ / |/| |
| * | Create X509HostnameVerifier adapter to verify Athenz identity in httpclientBjørn Christian Seime2018-01-042-3/+46
| * | Revert "Use httpclient artifact provided by JDisc"Bjørn Christian Seime2018-01-041-5/+5
| * | Revert "Implement Apache Http verifier interface in AthenzIdentityVerifier"Bjørn Christian Seime2018-01-041-32/+4
|/ /
* | Merge pull request #4550 from vespa-engine/bjorncs/dont-bundle-httpclientHarald Musum2018-01-041-5/+5
|\ \
| * | Use httpclient artifact provided by JDiscBjørn Christian Seime2018-01-041-5/+5
|/ /
* | Merge pull request #4549 from vespa-engine/freva/update-cert-pathBjørn Christian Seime2018-01-041-1/+1
|\ \
| * | Update cert pathValerij Fredriksen2018-01-041-1/+1
* | | Merge pull request #4510 from vespa-engine/arnej/remove-from-db-if-all-nodes-...Arne H Juul2018-01-031-0/+5
|\ \ \
| * | | guard against empty set of nodesArne Juul2017-12-201-0/+5
* | | | Merge pull request #4546 from vespa-engine/jvenstad/report-more-failing-apps-...Jon Bratseth2018-01-038-32/+34
|\ \ \ \
| * | | | Fix names and simplify somethingJon Marius Venstad2018-01-033-6/+4
| * | | | Remove ugly methodJon Marius Venstad2018-01-034-15/+13
| * | | | Remove redundant condition (and parameters) for ApplicationList filterJon Marius Venstad2018-01-034-10/+8
| * | | | List all applications failing upgrade in issue;Jon Marius Venstad2018-01-032-4/+12
* | | | | Merge pull request #4548 from vespa-engine/musum/fix-zone-bugBjørn Christian Seime2018-01-031-1/+1
|\ \ \ \ \
| * | | | | Fix bug when creating zone idHarald Musum2018-01-031-1/+1
* | | | | | Merge pull request #4547 from vespa-engine/bjorncs/jetty-truststore-password-...Bjørn Christian Seime2018-01-032-1/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add class descriptionBjørn Christian Seime2018-01-031-0/+2
| * | | | | Workaround for Jetty truststore without passwordBjørn Christian Seime2018-01-032-1/+35
|/ / / / /
* | | | | Merge pull request #4545 from vespa-engine/bjorncs/fixBjørn Christian Seime2018-01-031-5/+0
|\ \ \ \ \
| * | | | | Remove reference to deleted typeBjørn Christian Seime2018-01-031-5/+0
|/ / / / /
* | | | | Merge pull request #4543 from vespa-engine/hmusum/throw-correct-exceptionJon Bratseth2018-01-031-1/+1
|\ \ \ \ \
| * | | | | Throw ActivationConflictException when unable to acquire activate lockHarald Musum2018-01-031-1/+1
* | | | | | Merge pull request #4544 from vespa-engine/hmusum/change-logging-when-getting...Henning Baldersheim2018-01-031-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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