summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Revert "Jvenstad/pushing build system"Jon Marius Venstad2018-01-0524-467/+696
* Merge pull request #4556 from vespa-engine/jvenstad/pushing-build-systemJon Bratseth2018-01-0524-696/+467
|\
| * 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-056-307/+3
| * Added some doc and removed unused methodsJon Marius Venstad2018-01-052-8/+10
| * Fix testsJon Marius Venstad2018-01-0418-299/+273
| * Split PushingBuildSystem into a ZK backed queue and a maintainerJon Marius Venstad2018-01-0413-330/+194
| * Stash...Jon Marius Venstad2018-01-036-87/+108
| * Tests still remainJon Marius Venstad2018-01-036-113/+191
| * Unfinished PushingBuildSystemJon Marius Venstad2018-01-035-53/+203
* | Revert "Use httpclient version matching zts-client"Bjørn Christian Seime2018-01-052-4/+44
* | Use httpclient version matching zts-clientBjørn Christian Seime2018-01-042-44/+4
* | Create X509HostnameVerifier adapter to verify Athenz identity in httpclientBjørn Christian Seime2018-01-041-1/+41
* | Revert "Use httpclient artifact provided by JDisc"Bjørn Christian Seime2018-01-041-5/+5
* | Use httpclient artifact provided by JDiscBjørn Christian Seime2018-01-041-5/+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
* | | Fix bug when creating zone idHarald Musum2018-01-031-1/+1
| |/ |/|
* | Remove reference to deleted typeBjørn Christian Seime2018-01-031-5/+0
* | Use TLS with Athenz in ConfigServerRestExecutorBjørn Christian Seime2018-01-032-8/+33
* | Provide Athenz identity of configservers in ZoneRegistryBjørn Christian Seime2018-01-031-0/+5
* | Use https endpoint on config serverBjørn Christian Seime2018-01-033-7/+11
|/
* Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-0331-73/+58
* Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-0231-58/+73
* Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-0231-73/+58
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0231-58/+73
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-027-68/+195
|\
| * Always retry hanging jobsJon Bratseth2017-12-182-35/+41
| * Compare identity, not principalBjørn Christian Seime2017-12-181-1/+1
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-182-20/+142
| * Use AthenzPrincipal to retrieve NToken (ensures that token is verified)Bjørn Christian Seime2017-12-181-4/+2
| * Revert "Revert "Bratseth/tensorflow models""Jon Bratseth2017-12-182-9/+10
| * Revert "Bratseth/tensorflow models"gjoranv2017-12-172-10/+9
| * Merge pull request #4438 from vespa-engine/bratseth/tensorflow-modelsJon Bratseth2017-12-172-9/+10
| |\
| | * Merge with masterJon Bratseth2017-12-1399-1857/+2042
| | |\
| | * | Nonfunctional changes onlyJon Bratseth2017-12-032-9/+10
| * | | Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3Jon Marius Venstad2017-12-149-74/+65
| |\ \ \
* | | | | Split Zones and renamed itJon Marius Venstad2017-12-162-6/+6
* | | | | Name change of local variableJon Marius Venstad2017-12-152-7/+7
* | | | | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-155-14/+14
* | | | | Conflict resolvedJon Marius Venstad2017-12-148-30/+114
|\| | | |
| * | | | Merge pull request #4440 from vespa-engine/mpolden/remove-all-instances-on-de...Jon Bratseth2017-12-142-24/+53
| |\ \ \ \
| | * | | | Delete all instances on application deleteMartin Polden2017-12-142-24/+53
| | | |_|/ | | |/| |
| * | | | Merge pull request #4433 from vespa-engine/mpolden/expose-assigned-rotation-i...Jon Bratseth2017-12-134-5/+12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Expose assigned rotation in application APIMartin Polden2017-12-134-5/+12
| * | | | Merge pull request #4432 from vespa-engine/bjorncs/athenz-trust-storeMorten Tokle2017-12-131-0/+45
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add trust store configurator with Athenz CA certificatesBjørn Christian Seime2017-12-121-0/+45