summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4566 from vespa-engine/aressem/add-ref-to-trig-coprArnstein Ressem2018-01-081-1/+1
|\
| * Add ref and change type to branch to get Copr triggered.Arnstein Ressem2018-01-081-1/+1
* | Merge pull request #4559 from vespa-engine/smorgrav/iptables_nat_commandTorbjørn Smørgrav2018-01-082-0/+80
|\ \
| * | Move license notice on toptoby2018-01-052-2/+4
| * | Add a iptable command for snat/dnattoby2018-01-052-0/+78
| |/
* | Merge pull request #4562 from vespa-engine/arnej/add-metric-for-more-handlersJon Bratseth2018-01-0724-81/+79
|\ \
| * | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-059-23/+37
| * | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-052-5/+6
| * | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-055-25/+18
| * | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-057-28/+15
| * | add trivial gettersArne Juul2018-01-051-0/+3
* | | Merge pull request #4542 from vespa-engine/jvenstad/zone-cleanup-5Jon Marius Venstad2018-01-052-10/+10
|\ \ \
| * | | vargargs for some filtersJon Marius Venstad2018-01-032-10/+10
* | | | Merge pull request #4558 from vespa-engine/aressem/add-release-to-tito-tag-fo...Bjørn Christian Seime2018-01-051-2/+2
|\ \ \ \
| * | | | For now Copr expect the release number so we should provide it.Arnstein Ressem2018-01-051-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #4560 from vespa-engine/revert-4556-jvenstad/pushing-build...Arnstein Ressem2018-01-0526-504/+699
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Jvenstad/pushing build system"Jon Marius Venstad2018-01-0526-504/+699
|/ / /
* | | Merge pull request #4556 from vespa-engine/jvenstad/pushing-build-systemJon Bratseth2018-01-0526-699/+504
|\ \ \ | |_|/ |/| |
| * | Removed DELETE jobsJon Marius Venstad2018-01-052-15/+1
| * | Moved mock to stubs and removed unused code (putting it in a different branch)Jon Marius Venstad2018-01-057-307/+18
| * | Added some doc and removed unused methodsJon Marius Venstad2018-01-052-8/+10
| * | Fix testsJon Marius Venstad2018-01-0419-299/+295
| * | Split PushingBuildSystem into a ZK backed queue and a maintainerJon Marius Venstad2018-01-0413-330/+194
| * | Stash...Jon Marius Venstad2018-01-037-90/+108
| * | Tests still remainJon Marius Venstad2018-01-036-113/+191
| * | Unfinished PushingBuildSystemJon Marius Venstad2018-01-036-55/+205
* | | Merge pull request #4555 from vespa-engine/revert-4552-bjorncs/controller-ser...Bjørn Christian Seime2018-01-053-5/+49
|\ \ \
| * | | 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