aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4267 from vespa-engine/mortent/validate-identityBjørn Christian Seime2017-11-275-8/+101
|\
| * Validate athenz-domain in deployment.xml equal to tenant domainMorten Tokle2017-11-245-8/+101
* | Fix rotations metricMartin Polden2017-11-242-18/+23
|/
* Merge pull request #4247 from vespa-engine/mpolden/import-zone-api-v2Jon Bratseth2017-11-2321-10/+1028
|\
| * Reimplement /zone/v2Martin Polden2017-11-229-2/+325
| * Import proxy packageMartin Polden2017-11-229-0/+675
| * Set correct URL in defaultRegionMartin Polden2017-11-224-8/+28
* | Reduce log noise: No need to log stack traceHarald Musum2017-11-231-1/+2
* | Exclude all Jackson deps from athenz zms/zts java clientBjørn Christian Seime2017-11-221-0/+26
* | Match Before annotation is the internal user auth filterBjørn Christian Seime2017-11-221-2/+0
* | Improve error message when user authentication failsBjørn Christian Seime2017-11-223-17/+26
* | Merge pull request #4240 from vespa-engine/bjorncs/rewrite-user-principal-to-...Bjørn Christian Seime2017-11-221-3/+27
|\ \
| * | Improve error messageBjørn Christian Seime2017-11-221-1/+1
| * | Rename method to better indicate its functionBjørn Christian Seime2017-11-221-2/+2
| * | Rewrite user principal as Athenz principalBjørn Christian Seime2017-11-221-0/+24
| |/
* / Count prod onlyJon Bratseth2017-11-222-3/+8
|/
* Merge pull request #4231 from vespa-engine/jvenstad/ignore-PR-app-ownershipJon Bratseth2017-11-221-1/+1
|\
| * Do not send to default-pr applicationsJon Marius Venstad2017-11-211-1/+1
* | Verify zones before storing anythingJon Marius Venstad2017-11-224-6/+20
* | 12 hours instead of 1Jon Marius Venstad2017-11-211-1/+1
|/
* Merge branch 'master' into jvenstad/application-locking-revisedJon Marius Venstad2017-11-2117-55/+435
|\
| * Nonfunctional changes onlyJon Bratseth2017-11-212-1/+9
| * Merge pull request #4202 from vespa-engine/bjorncs/athenz-bouncer-filterBjørn Christian Seime2017-11-214-17/+117
| |\
| | * Send error response as application/json instead of htmlBjørn Christian Seime2017-11-203-24/+44
| | * Add filter combining Athenz with user authentication filterBjørn Christian Seime2017-11-203-1/+81
| * | Merge pull request #4215 from vespa-engine/jvenstad/no-ownership-issues-for-n...Jon Bratseth2017-11-214-30/+57
| |\ \
| | * | No longer file issues when no production deploymentsJon Marius Venstad2017-11-214-30/+57
| * | | Merge pull request #4213 from vespa-engine/mpolden/import-zone-api-v1Jon Bratseth2017-11-218-8/+253
| |\ \ \ | | |/ / | |/| |
| | * | Reimplement /zone/v1Martin Polden2017-11-218-8/+253
* | | | One author per lineJon Marius Venstad2017-11-211-1/+2
* | | | CleanJon Marius Venstad2017-11-211-11/+4
* | | | Made accessors for Lock and LockedApplication more privateJon Marius Venstad2017-11-2110-98/+52
* | | | Committing to switch machinesJon Marius Venstad2017-11-2120-395/+472
|\| | |
| * | | Expose issue ids for applicationsJon Marius Venstad2017-11-205-3/+18
| * | | Removed unused file — it was merged with an existing one insteadJon Marius Venstad2017-11-201-53/+0
| * | | Update application metrics together with deployment metricsJon Marius Venstad2017-11-2015-82/+208
| | |/ | |/|
| * | Test response cleanupJon Marius Venstad2017-11-206-77/+38
| * | Allow limited recursive, test it and use Builder for test requestsJon Marius Venstad2017-11-204-289/+315
* | | Committing to merge conflicts from masterJon Marius Venstad2017-11-219-95/+70
* | | Added new shiny things, like lockedIfPresent and idListJon Marius Venstad2017-11-183-65/+107
|/ /
* | Use the leaf withs in the test as wellJon Marius Venstad2017-11-171-4/+6
* | Merge pull request #4189 from vespa-engine/jvenstad/reduce-log-level-for-404-...Jon Marius Venstad2017-11-171-1/+1
|\ \
| * | Fine, FINE;Jon Marius Venstad2017-11-171-1/+1
| * | Reduce to FINERJon Marius Venstad2017-11-171-1/+1
| |/
* / Hide sub-obejcts that aren't leaves, to reduce risk of coding errors'Jon Marius Venstad2017-11-177-75/+89
|/
* Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deuxJon Marius Venstad2017-11-1711-137/+88
|\
| * Re-insert negation o_OJon Marius Venstad2017-11-171-1/+1
| * Removed redundant codeJon Marius Venstad2017-11-171-7/+1
| * Reverted the two non-improvementsJon Marius Venstad2017-11-172-9/+15
| * Resolved conflictJon Marius Venstad2017-11-1713-98/+248
| |\