summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo
Commit message (Expand)AuthorAgeFilesLines
* 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-082-14/+11
|/
* Merge with masterJon Bratseth2017-11-0810-120/+87
|\
| * Merge pull request #4026 from vespa-engine/jvenstad/deployment-stuff-cleanupJon Marius Venstad2017-11-088-119/+81
| |\
| | * Reverted fixJon Marius Venstad2017-11-072-6/+1
| | * Temporary fix for unstable unit testJon Marius Venstad2017-11-072-1/+6
| | * Name changes, minor refactoring, should be non-functional onlyJon Marius Venstad2017-11-078-119/+81
| * | Fixed conflictJon Marius Venstad2017-11-072-1/+6
| |/
* / Complete upgrades which already startedJon Bratseth2017-11-082-15/+32
|/
* Merge pull request #4017 from vespa-engine/jvenstad/deployment-api-expansion-...Jon Marius Venstad2017-11-0610-139/+371
|\
| * Updated response to show failing, running and # of # production jobsJon Marius Venstad2017-11-064-46/+55
| * Fixed stray !Jon Marius Venstad2017-11-034-35/+43
| * Finished JobList, need to fix a testJon Marius Venstad2017-11-0311-124/+339
| * Revert "Jvenstad/expose more deployment info in v1"Jon Marius Venstad2017-11-0310-203/+86
| * 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-028-47/+140
| |\
| * | API cleanupJon Marius Venstad2017-11-021-23/+7
| * | Add relevant job info to application blobsJon Marius Venstad2017-11-021-21/+73
| * | Updated testsJon Marius Venstad2017-11-021-4/+3
| * | Expose deploying applications, and some cleanupJon Marius Venstad2017-11-029-74/+69
| * | Getting ApplicationList changesJon Marius Venstad2017-11-0213-325/+368
| |\ \
| * | | 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-031-4/+20
* | | | | Return correct response code when there is a ConfigServerExceptionHarald Musum2017-11-031-1/+11
| |_|_|/ |/| | |
* | | | Add importJon Bratseth2017-11-021-0/+1
* | | | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-goodJon Bratseth2017-11-025-44/+134
|\ \ \ \
| * | | | Rename methodJon Bratseth2017-11-021-3/+3
| * | | | Newer downgrade a production deploymentJon Bratseth2017-11-022-14/+66
| * | | | Always try to upgrade to the latest good versionJon Bratseth2017-11-013-30/+68
| | |/ / | |/| |
* | | | Merge pull request #3964 from vespa-engine/bjorncs/athenz-user-domaingjoranv2017-11-022-3/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Athenz now uses "user" as principal domain and "home" as personal domainBjørn Christian Seime2017-11-012-3/+4
| | |/ | |/|
* | | Changes as per comentsJon Marius Venstad2017-11-012-40/+37
* | | Grace period of four hoursJon Marius Venstad2017-11-011-1/+1
* | | Moved subset selection code to ApplicationListJon Marius Venstad2017-11-012-41/+62
* | | List only failing applicatoin, with failures older than two hoursJon Marius Venstad2017-11-011-14/+29
|/ /
* | Merge pull request #3953 from vespa-engine/bjorncs/cleanupMartin Polden2017-11-012-67/+0
|\ \
| * | Remove unused filesBjørn Christian Seime2017-10-312-67/+0
| |/
* | Merge pull request #3947 from vespa-engine/mpolden/locked-applicationMartin Polden2017-11-0110-220/+297
|\ \ | |/ |/|
| * Wrap lock and application and use it when persisting dataMartin Polden2017-10-3110-220/+297
* | Merge pull request #3933 from vespa-engine/bjorncs/remove-deprecated-authoriz...Bjørn Christian Seime2017-10-314-87/+50
|\ \
| * | Be consistent on curly braces. Remove NPE when not authenticatedBjørn Christian Seime2017-10-311-4/+8
| * | Handle NotAuthorizedException in ApplicationApiHandlerBjørn Christian Seime2017-10-272-1/+11
| * | Cleanup deployment authorizationBjørn Christian Seime2017-10-273-86/+35
* | | Send system version with broken deploymentsJon Marius Venstad2017-10-301-1/+2
| |/ |/|