aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| | * Always try to upgrade to the latest good versionJon Bratseth2017-11-017-98/+188
| * | Merge pull request #3964 from vespa-engine/bjorncs/athenz-user-domaingjoranv2017-11-023-6/+7
| |\ \
| | * | Athenz now uses "user" as principal domain and "home" as personal domainBjørn Christian Seime2017-11-013-6/+7
* | | | 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
|\| | |
| * | | 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-012-14/+34
| |/ /
| * | 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-0116-261/+350
| |\ \ | | |/ | |/|
| | * Wrap lock and application and use it when persisting dataMartin Polden2017-10-3116-261/+350
* | | UnfinishedJon Marius Venstad2017-11-023-9/+37
|/ /
* | Merge pull request #3933 from vespa-engine/bjorncs/remove-deprecated-authoriz...Bjørn Christian Seime2017-10-315-88/+51
|\ \
| * | 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-274-87/+36
* | | Send system version with broken deploymentsJon Marius Venstad2017-10-302-2/+2
| |/ |/|
* | Merge pull request #3941 from vespa-engine/hmusum/get-optional-before-throwin...Martin Polden2017-10-301-1/+1
|\ \
| * | Get value from optional before throwing exceptionHarald Musum2017-10-301-1/+1
* | | Merge pull request #3939 from vespa-engine/bratseth/more-buildjob-infoMartin Polden2017-10-3011-54/+145
|\ \ \ | |/ / |/| |
| * | Test reason and idJon Bratseth2017-10-291-1/+4
| * | Return job id and reason in application/v4Jon Bratseth2017-10-293-0/+48
| * | Add run number and reason to build run infoJon Bratseth2017-10-278-53/+93
| |/
* | Fixed test >_<Jon Marius Venstad2017-10-292-1/+7
* | Polish and assert version upgrade does not produce issueJon Marius Venstad2017-10-271-9/+3
* | Add platform issue to testJon Marius Venstad2017-10-271-21/+34
* | Change criteria for issue filingJon Marius Venstad2017-10-272-25/+49
|/
* Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headersJon Marius Venstad2017-10-279-3/+12
|\
| * Add copyright headerJon Bratseth2017-10-279-3/+12
* | Merge pull request #3873 from vespa-engine/jvenstad/expose-property-info-in-a...Jon Marius Venstad2017-10-2717-380/+252
|\ \ | |/ |/|
| * Included property info with tenant repliesJon Marius Venstad2017-10-276-48/+52
| * Updated test fiel tooJon Marius Venstad2017-10-261-3/+3
| * toString -> displayNameJon Marius Venstad2017-10-261-1/+1
| * Comments taken into accountJon Marius Venstad2017-10-265-10/+10
| * Oops, forgot test responseJon Marius Venstad2017-10-251-0/+13
| * Merge branch 'master' into jvenstad/expose-property-info-in-application-apiJon Marius Venstad2017-10-251-4/+3
| |\