summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3735 from vespa-engine/bratseth/shorter-job-timeout-in-cdMartin Polden2017-10-121-1/+4
|\
| * Use a shorter job timeout in CD.Jon Bratseth2017-10-121-1/+4
* | Merge pull request #3734 from vespa-engine/bratseth/only-consider-prod-applic...Martin Polden2017-10-122-3/+4
|\ \ | |/ |/|
| * Filter out pull requestsJon Bratseth2017-10-122-3/+4
* | Merge pull request #3731 from vespa-engine/bratseth/use-better-info-to-decide...Martin Polden2017-10-122-10/+9
|\ \ | |/ |/|
| * Verify the actual change we are deployingJon Bratseth2017-10-122-10/+9
* | Fix disk usage from percent to ratiotoby2017-10-121-1/+1
|/
* Merge pull request #3704 from vespa-engine/bratseth/remove-in-progressMartin Polden2017-10-116-40/+48
|\
| * Remove printlnJon Bratseth2017-10-111-1/+0
| * Remove dead codeJon Bratseth2017-10-101-12/+0
| * Use isRunningJon Bratseth2017-10-101-1/+1
| * Use isRunningJon Bratseth2017-10-101-5/+4
| * Use isRunningJon Bratseth2017-10-103-11/+11
| * Fix test and use isRunningJon Bratseth2017-10-104-11/+33
* | Merge pull request #3516 from vespa-engine/smorgrav/cost_api_take_2Torbjørn Smørgrav2017-10-1127-228/+883
|\ \
| * | Fix bad conflict resolution on test responsetoby2017-10-101-2/+2
| * | Lock must be taken and released on application storetoby2017-10-103-28/+36
| * | Add two new maintainers to mainters responsetoby2017-10-101-10/+16
| * | Remove cost from wadl test response tootoby2017-10-101-5/+0
| * | Update Rest API to conform with previous unit test - adjust for api changes a...toby2017-10-103-48/+74
| * | Rebase mastertoby2017-10-104-10/+10
| * | The missing unit teststoby2017-10-102-0/+76
| * | Add unit test for maintainerstoby2017-10-101-1/+21
| * | Add getNodeList to configserverclienttoby2017-10-102-57/+23
| * | Improve documentation and get application lock when maintainging info and utilstoby2017-10-107-19/+46
| * | Complete serialization for the clusterinfo and clusterutils objectstoby2017-10-102-12/+26
| * | Serialization take 1 - not finishedtoby2017-10-106-191/+179
| * | Add mainainers to annotate deployments with cluster info and utilizationtoby2017-10-107-8/+343
| * | Bad merge - here is the correct ControllerTesttoby2017-10-101-55/+74
| * | Fold cost api into the application API - take 1toby2017-10-1012-106/+342
| * | Use new cost implementation in REST APItoby2017-10-103-24/+8
| * | Move calculateions to CostCluster and CostApplication classestoby2017-10-101-2/+2
| * | Update mock implementationtoby2017-10-101-0/+13
| * | Refactor cost APIs and modelling - this is a breaking changetoby2017-10-106-143/+85
| |/
* / primitives for storing and synchronizing provision states in zk (#3702)Andreas Eriksen2017-10-111-0/+31
|/
* Include filterJon Bratseth2017-10-101-1/+1
* Nonfunctional changes onlyJon Bratseth2017-10-106-9/+3
* Remove dead codeJon Bratseth2017-10-101-24/+0
* Trigger blocked jobs in maintenanceJon Bratseth2017-10-106-16/+80
* Cleaner triggering logicJon Bratseth2017-10-1010-46/+150
* Merge pull request #3687 from vespa-engine/bratseth/block-revision-changesJon Bratseth2017-10-099-34/+136
|\
| * CleanupJon Bratseth2017-10-094-15/+15
| * Support blocking application changesJon Bratseth2017-10-099-32/+134
* | Only upgrade applications that has production deploymentMartin Polden2017-10-093-0/+14
* | Fix typoMartin Polden2017-10-091-2/+2
|/
* Merge pull request #3664 from vespa-engine/mpolden/throttle-upgradesJon Bratseth2017-10-0510-21/+226
|\
| * Throttle upgradesMartin Polden2017-10-0510-21/+226
* | Sort deployments and jobs in application APIMartin Polden2017-10-056-11/+369
|/
* Merge pull request #3661 from vespa-engine/bratseth/retry-failing-jobs-lessJon Bratseth2017-10-054-17/+12
|\
| * Don't retry jobs that are runningJon Bratseth2017-10-052-14/+8