summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| |\
| * | Expose property relevant URIs and contact lists at tenant/{tenant}/propertyJon Marius Venstad2017-10-254-12/+63
| * | Resolved ocnflictsJon Marius Venstad2017-10-2498-785/+4349
| |\ \
| * | | Adjustments, mock and testsJon Marius Venstad2017-10-243-3/+13
| * | | Refactored deployment issues >_<Jon Marius Venstad2017-10-2010-356/+147
| * | | Merge master to get good unit testsJon Marius Venstad2017-10-0720-100/+682
| |\ \ \
| * | | | Add comment, commit to popJon Marius Venstad2017-10-061-0/+1
* | | | | Merge pull request #3911 from vespa-engine/bratseth/dont-record-component-tri...Jon Bratseth2017-10-261-1/+3
|\ \ \ \ \
| * | | | | Correct comment typoJon Bratseth2017-10-261-1/+1
| * | | | | We never trigger component: Remove those eventsJon Bratseth2017-10-261-1/+3
* | | | | | Don't allow delete with non-prod deploymentsJon Bratseth2017-10-262-2/+2
|/ / / / /
* | | | | Only consider production deploymentsJon Bratseth2017-10-264-23/+26
* | | | | Remove also if no zoneJon Bratseth2017-10-261-3/+3
* | | | | Merge pull request #3900 from vespa-engine/bratseth/remove-jobs-for-removed-d...Jon Bratseth2017-10-265-62/+60
|\ \ \ \ \
| * | | | | Clearer logicJon Bratseth2017-10-261-2/+2
| * | | | | Clearer logicJon Bratseth2017-10-261-3/+4
| * | | | | Minor improvementsJon Bratseth2017-10-264-53/+57
| * | | | | Nonfunctional changes onlyJon Bratseth2017-10-262-8/+1
* | | | | | Improve logging during tenant migration to AthenzBjørn Christian Seime2017-10-261-2/+4
|/ / / / /
* | | | / Always re-read application inside lockJon Bratseth2017-10-254-13/+29
| |_|_|/ |/| | |
* | | | Don't cache ZMS client instanceBjørn Christian Seime2017-10-241-4/+3
| |_|/ |/| |
* | | Merge pull request #3848 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-238-21/+21
|\ \ \
| * | | Revert "Rename TenantType.Athens -> TenantType.Athenz"Bjørn Christian Seime2017-10-238-21/+21