summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Expose issue ids for applicationsJon Marius Venstad2017-11-205-3/+18
* Removed unused file — it was merged with an existing one insteadJon Marius Venstad2017-11-201-53/+0
* Update application metrics together with deployment metricsJon Marius Venstad2017-11-2015-82/+208
* Test response cleanupJon Marius Venstad2017-11-206-77/+38
* Allow limited recursive, test it and use Builder for test requestsJon Marius Venstad2017-11-204-289/+315
* Use the leaf withs in the test as wellJon Marius Venstad2017-11-171-4/+6
* Merge pull request #4189 from vespa-engine/jvenstad/reduce-log-level-for-404-...Jon Marius Venstad2017-11-171-1/+1
|\
| * Fine, FINE;Jon Marius Venstad2017-11-171-1/+1
| * Reduce to FINERJon Marius Venstad2017-11-171-1/+1
* | Hide sub-obejcts that aren't leaves, to reduce risk of coding errors'Jon Marius Venstad2017-11-177-75/+89
|/
* Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deuxJon Marius Venstad2017-11-1711-137/+88
|\
| * Re-insert negation o_OJon Marius Venstad2017-11-171-1/+1
| * Removed redundant codeJon Marius Venstad2017-11-171-7/+1
| * Reverted the two non-improvementsJon Marius Venstad2017-11-172-9/+15
| * Resolved conflictJon Marius Venstad2017-11-1713-98/+248
| |\
| * | More name changesJon Marius Venstad2017-11-165-18/+14
| * | Added TODO:Jon Marius Venstad2017-11-151-5/+5
| * | More nitpickingJon Marius Venstad2017-11-155-36/+28
| * | More reassangement, name changesJon Marius Venstad2017-11-154-54/+24
| * | The only job we should trigger, without a zone, is component, on retriesJon Marius Venstad2017-11-151-12/+10
| * | Reordering, name changes, inliningJon Marius Venstad2017-11-156-32/+26
* | | Added doc and fixed typoJon Marius Venstad2017-11-172-2/+8
| |/ |/|
* | Fixed conflictJon Marius Venstad2017-11-1630-430/+539
|\ \
| * | Remove unused ControllerCuratorDbMartin Polden2017-11-161-69/+0
| * | Don't call initIdJon Bratseth2017-11-151-1/+0
| * | Revert "Revert "Remove redundant logic""Jon Bratseth2017-11-1513-224/+77
| * | Revert "Remove redundant logic"Harald Musum2017-11-1513-77/+224
| |/
| * Merge pull request #4137 from vespa-engine/jvenstad/minor-bug-squashJon Marius Venstad2017-11-151-16/+3
| |\
| | * Restore condition to its intention, without the redundant partJon Marius Venstad2017-11-151-14/+1
| | * Avoid potential NPEs and fix a conditionJon Marius Venstad2017-11-151-3/+3
| * | Merge pull request #4127 from vespa-engine/bratseth/remove-trigger-failedJon Marius Venstad2017-11-1513-224/+77
| |\ \ | | |/ | |/|
| | * Remove DelayedDeployer as it is covered by ReadyJobsTriggerJon Bratseth2017-11-145-62/+5
| | * Remove redundant logicJon Bratseth2017-11-1412-163/+73
| * | Merge pull request #4109 from vespa-engine/jvenstad/recursive-application-apiJon Bratseth2017-11-1416-119/+458
| |\ \ | | |/ | |/|
| | * Fixed more responses"Jon Marius Venstad2017-11-142-1/+2
| | * Use @include and list self-info in tenant and application blobsJon Marius Venstad2017-11-1415-640/+136
| | * Test recursive responses at tenant and application level as wellJon Marius Venstad2017-11-143-0/+530
| | * Added tenant name to recursive root response, moved stuff, and testJon Marius Venstad2017-11-143-39/+349
| | * Moved stuff around, and special behaviour for "recursive=true"Jon Marius Venstad2017-11-143-81/+83
* | | Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-1611-29/+248
|/ /
* | Merge pull request #4107 from vespa-engine/bratseth/tweak-reason-2Jon Marius Venstad2017-11-141-1/+2
|\ \ | |/ |/|
| * Better reasonJon Bratseth2017-11-141-1/+2
* | Fixed conditionJon Marius Venstad2017-11-102-1/+4
|/
* Allow parallel triggering of non-prod jobsJon Bratseth2017-11-101-2/+2
* Fixed some TODO's, most notably removing the always-1 id for triggeringJon Marius Venstad2017-11-0911-27/+21
* Remove junkJon Marius Venstad2017-11-091-3/+0
* Fix some conditions, remove unused codeJon Marius Venstad2017-11-099-53/+23
* Be more precise about first failures.Jon Marius Venstad2017-11-093-10/+11
* Merging to get changes from previous branchJon Marius Venstad2017-11-0914-49/+24
|\
| * Resolved conflicts;Jon Marius Venstad2017-11-0911-45/+17
| |\