summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Revert "Include instance hostname in Athenz node certificates"Bjørn Christian Seime2019-08-281-2/+2
* Add resources to application nodes APIValerij Fredriksen2019-08-285-4/+41
* Merge pull request #10412 from vespa-engine/bjorncs/hostnameBjørn Christian Seime2019-08-281-4/+3
|\
| * Include instance hostname in Athenz node certificatesBjørn Christian Seime2019-08-261-2/+2
| * Remove unused parameters from ZtsClient methodsBjørn Christian Seime2019-08-261-4/+3
* | Log message in responseHarald Musum2019-08-281-0/+1
* | Only pass container endpoints in deployMartin Polden2019-08-272-11/+10
* | Merge pull request #10422 from vespa-engine/revert-10419-revert-10414-andreer...Andreas Eriksen2019-08-272-10/+16
|\ \
| * | disable cert when feature flag is off, even if already provisionedandreer2019-08-271-5/+6
| * | Revert "Revert "provision certificates for directly routed zones""Andreas Eriksen2019-08-272-5/+10
* | | Remove multiple-global-endpoints feature flagMartin Polden2019-08-275-115/+57
|/ /
* | Merge pull request #10410 from vespa-engine/mpolden/preserve-commit-detailsJon Marius Venstad2019-08-273-11/+54
|\ \
| * | Preserve commit details of previous versionsMartin Polden2019-08-263-11/+54
| |/
* | Revert "provision certificates for directly routed zones"Andreas Eriksen2019-08-262-10/+5
* | Merge pull request #10414 from vespa-engine/andreer/only-provision-cert-for-d...Andreas Eriksen2019-08-262-5/+10
|\ \
| * | provision certificates for directly routed zonesandreer2019-08-262-5/+10
| |/
* | Merge pull request #10408 from vespa-engine/jvenstad/never-hide-dev=jobsTorbjørn Smørgrav2019-08-262-3/+23
|\ \ | |/ |/|
| * Update test response even moreJon Marius Venstad2019-08-261-1/+1
| * Update test responseJon Marius Venstad2019-08-261-1/+22
| * Don't hide dev jobs just because there isn't (yet) a dev deploymentJon Marius Venstad2019-08-261-2/+1
* | Merge pull request #10407 from vespa-engine/mpolden/handle-multiple-rotations...Martin Polden2019-08-265-23/+150
|\ \ | |/ |/|
| * Include status of all rotations in application APIMartin Polden2019-08-265-23/+150
* | Merge pull request #10394 from vespa-engine/andreer/separate-store-for-app-certsAndreas Eriksen2019-08-267-56/+54
|\ \ | |/ |/|
| * separate zk path for application certificatesandreer2019-08-237-56/+54
* | Remove rotation status from MetricsServiceMockMartin Polden2019-08-232-29/+5
* | Retrieve rotation status from GlobalRoutingServiceMartin Polden2019-08-2312-100/+243
|/
* Support storing status of multiple rotations per applicationMartin Polden2019-08-2213-80/+251
* Remove stale testMartin Polden2019-08-221-35/+2
* Make constants staticMartin Polden2019-08-221-77/+77
* Rename RotationStatus -> RotationStateMartin Polden2019-08-229-45/+45
* Remove unnecessary getterMartin Polden2019-08-229-55/+51
* Remove unused methodMartin Polden2019-08-221-5/+0
* Remove unnecessary getterMartin Polden2019-08-222-6/+3
* Display out-of-capacity as separate error status for production jobsJon Marius Venstad2019-08-222-3/+4
* Add "url" element to dev jobs in deployment overviewJon Marius Venstad2019-08-212-4/+9
* Merge pull request #10335 from vespa-engine/mpolden/fix-todoMartin Polden2019-08-213-16/+3
|\
| * Fix typoMartin Polden2019-08-201-1/+1
| * Remove support for legacy serialization formatMartin Polden2019-08-192-15/+2
* | Fix metering responseOla Aunrønning2019-08-203-16/+46
* | Revert "Use new jvm element for tester container JDisc memory setting"Jon Marius Venstad2019-08-202-6/+2
* | Merge branch 'master' into olaa/metering-apiOla Aunrønning2019-08-1921-175/+371
|\|
| * Merge pull request #10302 from vespa-engine/andreer/wildcard-endpointsAndreas Eriksen2019-08-162-12/+98
| |\
| | * don't return non-default ports from dnsNameandreer2019-08-161-1/+1
| | * receive zone in wildcard and target methodsandreer2019-08-163-33/+27
| | * work around URI handling of asterisks in host partandreer2019-08-161-1/+2
| | * enable generating endpoint names with wildcards (for certs)andreer2019-08-163-23/+114
| * | Merge pull request #10298 from vespa-engine/mpolden/controller-versionMartin Polden2019-08-1619-163/+273
| |\ \ | | |/ | |/|
| | * Remove GitHub dependencyMartin Polden2019-08-153-20/+8
| | * Use commit details from ControllerVersion in VersionStatusMartin Polden2019-08-153-20/+15
| | * Store version and commit details in ControllerVersionMartin Polden2019-08-1510-61/+194