aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller
Commit message (Expand)AuthorAgeFilesLines
* Fix a few TODOsMartin Polden2017-12-051-1/+1
* Shorten method namesMartin Polden2017-12-054-6/+5
* Cleanup authorization testing in ApplicationApiTestBjørn Christian Seime2017-12-043-109/+143
* Introduce AthenzIdentity and AthenzUserBjørn Christian Seime2017-12-044-19/+19
* Merge pull request #4309 from vespa-engine/mpolden/move-rotation-to-applicationMartin Polden2017-11-3010-71/+291
|\
| * Move rotation to applicationMartin Polden2017-11-2910-71/+291
* | Validate athenz-domain in deployment.xml equal to tenant domainMorten Tokle2017-11-243-3/+82
|/
* Merge pull request #4247 from vespa-engine/mpolden/import-zone-api-v2Jon Bratseth2017-11-2310-3/+369
|\
| * Reimplement /zone/v2Martin Polden2017-11-225-0/+195
| * Import proxy packageMartin Polden2017-11-222-0/+152
| * Set correct URL in defaultRegionMartin Polden2017-11-223-3/+22
* | Count prod onlyJon Bratseth2017-11-221-1/+2
|/
* Verify zones before storing anythingJon Marius Venstad2017-11-222-2/+2
* Merge branch 'master' into jvenstad/application-locking-revisedJon Marius Venstad2017-11-219-24/+167
|\
| * Nonfunctional changes onlyJon Bratseth2017-11-211-0/+8
| * Merge pull request #4215 from vespa-engine/jvenstad/no-ownership-issues-for-n...Jon Bratseth2017-11-212-16/+41
| |\
| | * No longer file issues when no production deploymentsJon Marius Venstad2017-11-212-16/+41
| * | Merge pull request #4213 from vespa-engine/mpolden/import-zone-api-v1Jon Bratseth2017-11-216-8/+118
| |\ \ | | |/ | |/|
| | * Reimplement /zone/v1Martin Polden2017-11-216-8/+118
* | | Made accessors for Lock and LockedApplication more privateJon Marius Venstad2017-11-214-21/+10
* | | Committing to switch machinesJon Marius Venstad2017-11-2111-346/+379
|\| |
| * | Expose issue ids for applicationsJon Marius Venstad2017-11-202-1/+13
| * | Update application metrics together with deployment metricsJon Marius Venstad2017-11-206-26/+75
| * | Test response cleanupJon Marius Venstad2017-11-206-77/+38
| * | Allow limited recursive, test it and use Builder for test requestsJon Marius Venstad2017-11-203-286/+298
* | | Committing to merge conflicts from masterJon Marius Venstad2017-11-212-7/+4
|/ /
* / Use the leaf withs in the test as wellJon Marius Venstad2017-11-171-4/+6
|/
* Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deuxJon Marius Venstad2017-11-172-9/+9
|\
| * Resolved conflictJon Marius Venstad2017-11-175-3/+118
| |\
| * | Reordering, name changes, inliningJon Marius Venstad2017-11-152-9/+9
* | | Added doc and fixed typoJon Marius Venstad2017-11-171-2/+1
| |/ |/|
* | Fixed conflictJon Marius Venstad2017-11-1619-95/+422
|\ \
| * | Revert "Revert "Remove redundant logic""Jon Bratseth2017-11-156-55/+49
| * | Revert "Remove redundant logic"Harald Musum2017-11-156-49/+55
| |/
| * Merge pull request #4127 from vespa-engine/bratseth/remove-trigger-failedJon Marius Venstad2017-11-156-55/+49
| |\
| | * Remove DelayedDeployer as it is covered by ReadyJobsTriggerJon Bratseth2017-11-142-8/+5
| | * Remove redundant logicJon Bratseth2017-11-146-48/+45
| * | Fixed more responses"Jon Marius Venstad2017-11-142-1/+2
| * | Use @include and list self-info in tenant and application blobsJon Marius Venstad2017-11-1414-628/+123
| * | 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-142-37/+344
| |/
* / Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-165-2/+117
|/
* Fixed some TODO's, most notably removing the always-1 id for triggeringJon Marius Venstad2017-11-093-10/+13
* Fix some conditions, remove unused codeJon Marius Venstad2017-11-094-12/+11
* Resolved conflicts;Jon Marius Venstad2017-11-093-14/+4
|\
| * Merge pull request #4046 from vespa-engine/mpolden/fix-jobrun-equalsJon Bratseth2017-11-093-15/+5
| |\
| | * Fix equalsMartin Polden2017-11-081-5/+4
| | * Fix serialization TODOsMartin Polden2017-11-082-10/+1
* | | Reinserted condition which should not have been removedJon Marius Venstad2017-11-091-1/+0
* | | Fixed conflictJon Marius Venstad2017-11-083-19/+19
|\| |