summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Indicate what kind of clustersJon Marius Venstad2019-10-043-6/+3
* | | Add test fileJon Marius Venstad2019-10-041-0/+20
* | | List content clusters also for application/v4 test-config responsesJon Marius Venstad2019-10-044-14/+22
* | | Merge pull request #10864 from vespa-engine/mpolden/stop-reading-unused-fieldJon Marius Venstad2019-10-035-119/+11
|\ \ \
| * | | Stop reading unused clusterUtils fieldMartin Polden2019-10-035-119/+11
* | | | Merge pull request #10849 from vespa-engine/mpolden/nodes-failing-system-upgr...Jon Marius Venstad2019-10-0319-159/+539
|\ \ \ \
| * | | | Only count actively upgrading nodesMartin Polden2019-10-0310-97/+136
| * | | | Do not write version field per nodeMartin Polden2019-10-031-5/+4
| * | | | Remove unnecessary field validationMartin Polden2019-10-031-1/+1
| * | | | Emit metric for nodes failing system upgradeMartin Polden2019-10-0218-152/+494
| | |_|/ | |/| |
* | | | Merge pull request #10859 from vespa-engine/hmusum/reduce-JobRunner-intervalJon Marius Venstad2019-10-031-1/+1
|\ \ \ \
| * | | | Reduce JobRunner intervalHarald Musum2019-10-031-1/+1
| |/ / /
* | | | Check for empty deployment spec on submissionsJon Marius Venstad2019-10-031-0/+4
* | | | Update expected error message as wellJon Marius Venstad2019-10-032-8/+6
* | | | Use instance in error message when failing to delete an instanceJon Marius Venstad2019-10-031-1/+1
* | | | Split instance and application and creation and deletion, but let REST API do...Jon Marius Venstad2019-10-0316-152/+188
| |/ / |/| |