summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
|/
* Merge pull request #4017 from vespa-engine/jvenstad/deployment-api-expansion-...Jon Marius Venstad2017-11-0614-205/+444
|\
| * Updated response to show failing, running and # of # production jobsJon Marius Venstad2017-11-065-50/+61
| * Fixed stray !Jon Marius Venstad2017-11-035-37/+43
| * Finished JobList, need to fix a testJon Marius Venstad2017-11-0316-190/+412
| * Revert "Jvenstad/expose more deployment info in v1"Jon Marius Venstad2017-11-0314-274/+152
| * Started JobListJon Marius Venstad2017-11-031-0/+57
| * Add upgrade condition to running jobs, tooJon Marius Venstad2017-11-021-0/+1
| * Fixed test and resolved conflictJon Marius Venstad2017-11-0214-104/+231
| |\
| * | API cleanupJon Marius Venstad2017-11-021-23/+7
| * | Add relevant job info to application blobsJon Marius Venstad2017-11-022-25/+88
| * | Updated testsJon Marius Venstad2017-11-023-24/+22
| * | Expose deploying applications, and some cleanupJon Marius Venstad2017-11-0212-78/+87
| * | Getting ApplicationList changesJon Marius Venstad2017-11-0220-366/+426
| |\ \
| * | | UnfinishedJon Marius Venstad2017-11-023-9/+37
* | | | Inject and use existing ZooKeeperMartin Polden2017-11-062-55/+70
* | | | Merge pull request #4006 from vespa-engine/mpolden/add-key-service-mockBjørn Christian Seime2017-11-031-0/+2
|\ \ \ \
| * | | | Add key service mockMartin Polden2017-11-031-0/+2
* | | | | Start the first job in triggerReadyJon Bratseth2017-11-032-4/+39
* | | | | Return correct response code when there is a ConfigServerExceptionHarald Musum2017-11-034-1/+35
| |_|_|/ |/| | |
* | | | Add importJon Bratseth2017-11-021-0/+1
* | | | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-goodJon Bratseth2017-11-0210-115/+258
|\ \ \ \
| * | | | Rename methodJon Bratseth2017-11-021-3/+3
| * | | | Newer downgrade a production deploymentJon Bratseth2017-11-024-19/+72