aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo
Commit message (Expand)AuthorAgeFilesLines
* Update application metrics together with deployment metricsJon Marius Venstad2017-11-206-26/+75
* Test response cleanupJon Marius Venstad2017-11-206-77/+38
* Allow limited recursive, test it and use Builder for test requestsJon Marius Venstad2017-11-203-286/+298
* Use the leaf withs in the test as wellJon Marius Venstad2017-11-171-4/+6
* Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deuxJon Marius Venstad2017-11-172-9/+9
|\
| * Resolved conflictJon Marius Venstad2017-11-175-3/+118
| |\
| * | Reordering, name changes, inliningJon Marius Venstad2017-11-152-9/+9
* | | Added doc and fixed typoJon Marius Venstad2017-11-171-2/+1
| |/ |/|
* | Fixed conflictJon Marius Venstad2017-11-1619-95/+422
|\ \
| * | Revert "Revert "Remove redundant logic""Jon Bratseth2017-11-156-55/+49
| * | Revert "Remove redundant logic"Harald Musum2017-11-156-49/+55
| |/
| * Merge pull request #4127 from vespa-engine/bratseth/remove-trigger-failedJon Marius Venstad2017-11-156-55/+49
| |\
| | * Remove DelayedDeployer as it is covered by ReadyJobsTriggerJon Bratseth2017-11-142-8/+5
| | * Remove redundant logicJon Bratseth2017-11-146-48/+45
| * | Fixed more responses"Jon Marius Venstad2017-11-142-1/+2
| * | Use @include and list self-info in tenant and application blobsJon Marius Venstad2017-11-1414-628/+123
| * | 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-142-37/+344
| |/
* / Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-165-2/+117
|/
* Fixed some TODO's, most notably removing the always-1 id for triggeringJon Marius Venstad2017-11-093-10/+13
* Fix some conditions, remove unused codeJon Marius Venstad2017-11-094-12/+11
* Resolved conflicts;Jon Marius Venstad2017-11-093-14/+4
|\
| * Merge pull request #4046 from vespa-engine/mpolden/fix-jobrun-equalsJon Bratseth2017-11-093-15/+5
| |\
| | * Fix equalsMartin Polden2017-11-081-5/+4
| | * Fix serialization TODOsMartin Polden2017-11-082-10/+1
* | | Reinserted condition which should not have been removedJon Marius Venstad2017-11-091-1/+0
* | | Fixed conflictJon Marius Venstad2017-11-083-19/+19
|\| |
| * | Tweak job run reasonsJon Bratseth2017-11-083-19/+19
| |/
* | Check for ! lastTriggered.at.isBefore.lastCompeted.at, which is betterJon Marius Venstad2017-11-087-20/+64
* | Merged masterJon Marius Venstad2017-11-083-1/+9
* | Merging masterJon Marius Venstad2017-11-082-43/+38
|\|
| * Merge with masterJon Bratseth2017-11-088-73/+56
| |\
| * | Complete upgrades which already startedJon Bratseth2017-11-082-43/+38
* | | Popped stashJon Marius Venstad2017-11-081-0/+1
| |/ |/|
* | Removed unused methodJon Marius Venstad2017-11-071-10/+0
* | Reverted fixJon Marius Venstad2017-11-071-0/+10
* | Temporary fix for unstable unit testJon Marius Venstad2017-11-071-10/+0
* | Name changes, minor refactoring, should be non-functional onlyJon Marius Venstad2017-11-079-64/+57
|/
* Merge pull request #4017 from vespa-engine/jvenstad/deployment-api-expansion-...Jon Marius Venstad2017-11-064-66/+73
|\
| * Updated response to show failing, running and # of # production jobsJon Marius Venstad2017-11-061-4/+6
| * Fixed stray !Jon Marius Venstad2017-11-031-2/+0
| * Finished JobList, need to fix a testJon Marius Venstad2017-11-035-66/+73
| * Revert "Jvenstad/expose more deployment info in v1"Jon Marius Venstad2017-11-034-71/+66
| * Fixed test and resolved conflictJon Marius Venstad2017-11-026-57/+91
| |\
| * | Add relevant job info to application blobsJon Marius Venstad2017-11-021-4/+15
| * | Updated testsJon Marius Venstad2017-11-022-20/+19
| * | Expose deploying applications, and some cleanupJon Marius Venstad2017-11-023-4/+18
* | | Start the first job in triggerReadyJon Bratseth2017-11-031-0/+19
* | | Return correct response code when there is a ConfigServerExceptionHarald Musum2017-11-033-0/+24
| |/ |/|
* | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-goodJon Bratseth2017-11-025-71/+124
|\ \