summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10916 from vespa-engine/mpolden/remove-legacy-formatsMartin Polden2019-10-096-173/+4
|\
| * Remove legacy NodeVersion formatsMartin Polden2019-10-086-173/+4
* | Merge pull request #10921 from vespa-engine/ogronnesby/simplified-rolesØyvind Grønnesby2019-10-099-140/+83
|\ \
| * | Update commentJon Marius Venstad2019-10-091-1/+1
| * | PATCH to POSTJon Marius Venstad2019-10-091-1/+1
| * | Remove visibility of "old" rolesØyvind Grønnesby2019-10-087-164/+62
| * | Introduce simplified roles without removing old ones - some tests commented outØyvind Grønnesby2019-10-086-43/+88
* | | Revert "Pick any instance and put rotation stuff in application level for now"Jon Marius Venstad2019-10-093-27/+7
* | | Pick any instance and put rotation stuff in application level for nowJon Marius Venstad2019-10-083-7/+27
* | | Merge pull request #10925 from vespa-engine/bratseth/instances-in-deployment-...Jon Bratseth2019-10-087-82/+104
|\ \ \
| * | | Revert "Merge pull request #10923 from vespa-engine/revert-10912-bratseth/ins...Jon Bratseth2019-10-087-82/+104
* | | | Merge pull request #10919 from vespa-engine/mpolden/log-time-takenAndreas Eriksen2019-10-082-5/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Log duration of name service dispatchingMartin Polden2019-10-082-5/+15
* | | | Revert "Bratseth/instances in deployment xml rebased take 2"Jon Bratseth2019-10-087-104/+82
* | | | Merge pull request #10920 from vespa-engine/jvenstad/set-whether-ci-in-test-c...Jon Marius Venstad2019-10-086-1/+9
|\ \ \ \
| * | | | Indicate whether test runtime is CI or not, in TestConfigJon Marius Venstad2019-10-086-1/+9
* | | | | Remove instance dimension where it should not beJon Marius Venstad2019-10-0812-62/+70
|/ / / /
* | | | Merge pull request #10911 from vespa-engine/jvenstad/application-response-wit...Jon Marius Venstad2019-10-0828-368/+432
|\ \ \ \ | |_|/ / |/| | |
| * | | Aggregate over instances in application responseJon Marius Venstad2019-10-0815-86/+284
| * | | Update more test responsesJon Marius Venstad2019-10-086-162/+4
| * | | Use more latestVersion and update some testsJon Marius Venstad2019-10-087-52/+22
| * | | Use Application.latestVersion instead of last component job successJon Marius Venstad2019-10-086-47/+65
| * | | Store latest submission version explicitlyJon Marius Venstad2019-10-084-23/+59
| * | | Revert "Bratseth/instances in deployment xml rebased"Jon Bratseth2019-10-077-104/+82
| * | | Merge pull request #10891 from vespa-engine/bratseth/instances-in-deployment-...Jon Bratseth2019-10-077-82/+104
| |\ \ \
| | * \ \ Merge with masterJon Bratseth2019-10-0760-675/+1153
| | |\ \ \
| | * | | | Inherit/use defaults in instancesJon Bratseth2019-10-071-3/+3
| | * | | | Avoid deprecated methodsJon Bratseth2019-10-047-79/+101
* | | | | | Merge pull request #10906 from vespa-engine/ogronnesby/tenant-cost-apiØyvind Grønnesby2019-10-082-0/+61
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Clean importsØyvind Grønnesby2019-10-081-2/+0
| * | | | | Don't expose day in API as we don't really care about it hereØyvind Grønnesby2019-10-082-10/+12
| * | | | | Rename tenantCostParseMonth -> tenantCostParseDateØyvind Grønnesby2019-10-081-2/+2
| * | | | | Use IllegalArgumentException for bad date string and rename paramØyvind Grønnesby2019-10-081-17/+10
| * | | | | Initial tenant cost API that is not wired up to any clients yetØyvind Grønnesby2019-10-072-0/+68
| | |_|/ / | |/| | |
* | | | | Allow non-existing instances when appropriateJon Bratseth2019-10-081-2/+2
* | | | | Revert "Merge pull request #10909 from vespa-engine/revert-10891-bratseth/ins...Jon Bratseth2019-10-087-82/+104
| |_|_|/ |/| | |
* | | | Update equals/hashCodeMartin Polden2019-10-072-4/+5
* | | | Remove unused methodMartin Polden2019-10-071-9/+0
* | | | Report metric for nodes failing OS upgradeMartin Polden2019-10-073-6/+113
* | | | Replace OsVersion.Node with NodeVersionMartin Polden2019-10-0711-177/+187
* | | | Stop reading legacy configServerHostnames fieldMartin Polden2019-10-074-30/+37
* | | | Add zone field to NodeVersionMartin Polden2019-10-075-9/+25
* | | | Extract NodeVersionSerializerMartin Polden2019-10-072-17/+68
| |/ / |/| |
* | | Merge pull request #10897 from vespa-engine/mpolden/remove-unused-fieldMartin Polden2019-10-077-112/+11
|\ \ \
| * | | Remove unused clusterUtilization fieldMartin Polden2019-10-077-97/+11
| * | | Remove dead codeMartin Polden2019-10-072-15/+0
| |/ /
* | | Merge pull request #10876 from vespa-engine/olaa/metering-by-zoneOla Aunrønning2019-10-073-25/+44
|\ \ \ | |/ / |/| |
| * | RefactoringOla Aunrønning2019-10-041-15/+16
| * | Add zone dimension to metering dataOla Aunrønning2019-10-043-24/+42
* | | Respons with new set of keys when changing themJon Marius Venstad2019-10-077-20/+80