aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| | * Reduce code duplicationMartin Polden2019-08-155-51/+47
| | * ListMap -> ListMultimapMartin Polden2019-08-151-19/+17
* | | Implement metering apiOla Aunrønning2019-08-198-37/+73
|/ /
* | Merge pull request #10271 from vespa-engine/mpolden/disallow-cross-cloud-endp...Martin Polden2019-08-154-15/+111
|\ \ | |/ |/|
| * Disallow endpoints containing different cloudsMartin Polden2019-08-143-0/+60
| * Extract DeploymentSpecValidatorMartin Polden2019-08-142-15/+51
* | Merge pull request #10276 from vespa-engine/jvenstad/no-creds-when-no-athenz-...Harald Musum2019-08-143-3/+9
|\ \
| * | Set test credentials root only when it has credentialsJon Marius Venstad2019-08-143-3/+9
* | | Merge pull request #10270 from vespa-engine/freva/add-aws-regionValerij Fredriksen2019-08-142-15/+24
|\ \ \ | |_|/ |/| |
| * | Use aws region in AwsEventFectherValerij Fredriksen2019-08-141-10/+11
| * | Add cloud region name to ZoneApiValerij Fredriksen2019-08-141-5/+13
* | | Merge pull request #10251 from vespa-engine/mpolden/always-provision-certificateMartin Polden2019-08-143-15/+56
|\ \ \
| * | | Re-use certificate if already provisionedMartin Polden2019-08-133-11/+30
| * | | Always provision certificate on deployMartin Polden2019-08-132-13/+35
* | | | Merge pull request #10255 from vespa-engine/mpolden/stop-writing-unused-fieldsMartin Polden2019-08-143-30/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Stop writing unused fieldsMartin Polden2019-08-131-4/+0
| * | | SimplifyMartin Polden2019-08-131-15/+15
| * | | Remove unused methodMartin Polden2019-08-132-10/+1
| * | | Remove unused constantMartin Polden2019-08-131-1/+0
| |/ /
* | | Merge pull request #10259 from vespa-engine/mpolden/cleanupJon Marius Venstad2019-08-132-8/+5
|\ \ \ | |_|/ |/| |
| * | Remove unused methodsMartin Polden2019-08-131-2/+1
| * | Remove checked exception from signatureMartin Polden2019-08-131-6/+4
| |/
* | only include rotationIds for rotations assigned to zoneandreer2019-08-122-11/+8
* | expose bug in unit testandreer2019-08-121-10/+21
|/
* Merge pull request #10220 from vespa-engine/jvenstad/http-443-in-public-for-nowAndreas Eriksen2019-08-091-1/+3
|\
| * Public deployments have no valid web cert yet — work around thisJon Marius Venstad2019-08-091-1/+3
* | Merge pull request #10219 from vespa-engine/freva/instanceValerij Fredriksen2019-08-091-3/+4
|\ \
| * | tenant-application-instance-environment-region path for nodes and logsValerij Fredriksen2019-08-081-2/+4
| * | Remove duplicateValerij Fredriksen2019-08-081-1/+0
| |/
* / Revert "Revert "Revert "Revert "Automatically file a JIRA ticket for AWS even...Valerij Fredriksen2019-08-084-5/+67
|/
* Ensure advancing past log ttlOla Aunrønning2019-08-071-2/+2
* Revert "Automatically file a JIRA ticket for AWS events."Arnstein Ressem2019-08-074-67/+5
* Merge pull request #10131 from vespa-engine/mgimle/aws-event-fetcherMichael H. Gimle2019-08-064-5/+67
|\
| * Added suggested changesmgimle2019-08-051-2/+6
| * Added a mock aws event fetchermgimle2019-07-312-0/+4