summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\
| | * Merge pull request #4046 from vespa-engine/mpolden/fix-jobrun-equalsJon Bratseth2017-11-0911-46/+18
| | |\
| | | * Make constant readableMartin Polden2017-11-081-3/+2
| | | * Suppress unused for injected classesMartin Polden2017-11-082-0/+2
| | | * Remove unused codeMartin Polden2017-11-081-15/+6
| | | * Remove unused constantMartin Polden2017-11-081-2/+0
| | | * Fix equalsMartin Polden2017-11-082-7/+5
| | | * Fix serialization TODOsMartin Polden2017-11-084-19/+3
| * | | Reinserted condition which should not have been removedJon Marius Venstad2017-11-093-4/+7
* | | | Just comments and a name changeJon Marius Venstad2017-11-093-3/+9
|/ / /
* | | Fixed conflictJon Marius Venstad2017-11-085-33/+30
|\| |
| * | Merge branch 'master' into bratseth/job-run-reason-tweaksJon Bratseth2017-11-083-4/+5
| |\|
| | * I said I didn't like this code duplication >_<Jon Marius Venstad2017-11-081-2/+1
| | * Fix is-upgrading conditionJon Marius Venstad2017-11-082-2/+4
| * | Tweak job run reasonsJon Bratseth2017-11-085-33/+30
| |/
* | Check for ! lastTriggered.at.isBefore.lastCompeted.at, which is betterJon Marius Venstad2017-11-0812-31/+80
* | Merged masterJon Marius Venstad2017-11-084-2/+11
* | Merging masterJon Marius Venstad2017-11-084-58/+70
|\|
| * Merge with masterJon Bratseth2017-11-0818-193/+143
| |\
| * | Complete upgrades which already startedJon Bratseth2017-11-084-58/+70
* | | Popped stashJon Marius Venstad2017-11-084-1/+4
* | | Some minors and commentsJon Marius Venstad2017-11-085-26/+32
| |/ |/|
* | Merge pull request #4026 from vespa-engine/jvenstad/deployment-stuff-cleanupJon Marius Venstad2017-11-0817-193/+138
|\ \
| * | Removed unused methodJon Marius Venstad2017-11-071-10/+0
| * | Reverted fixJon Marius Venstad2017-11-073-6/+11
| * | Temporary fix for unstable unit testJon Marius Venstad2017-11-073-11/+6
| * | Name changes, minor refactoring, should be non-functional onlyJon Marius Venstad2017-11-0717-183/+138
| |/
* / Fixed conflictJon Marius Venstad2017-11-072-1/+6
|/