Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4247 from vespa-engine/mpolden/import-zone-api-v2 | Jon Bratseth | 2017-11-23 | 21 | -10/+1028 |
|\ | | | | | Import /zone/v2 | ||||
| * | Reimplement /zone/v2 | Martin Polden | 2017-11-22 | 9 | -2/+325 |
| | | |||||
| * | Import proxy package | Martin Polden | 2017-11-22 | 9 | -0/+675 |
| | | |||||
| * | Set correct URL in defaultRegion | Martin Polden | 2017-11-22 | 4 | -8/+28 |
| | | |||||
* | | Reduce log noise: No need to log stack trace | Harald Musum | 2017-11-23 | 1 | -1/+2 |
| | | |||||
* | | Exclude all Jackson deps from athenz zms/zts java client | Bjørn Christian Seime | 2017-11-22 | 1 | -0/+26 |
| | | |||||
* | | Match Before annotation is the internal user auth filter | Bjørn Christian Seime | 2017-11-22 | 1 | -2/+0 |
| | | |||||
* | | Improve error message when user authentication fails | Bjørn Christian Seime | 2017-11-22 | 3 | -17/+26 |
| | | |||||
* | | Merge pull request #4240 from ↵ | Bjørn Christian Seime | 2017-11-22 | 1 | -3/+27 |
|\ \ | | | | | | | | | | | | | vespa-engine/bjorncs/rewrite-user-principal-to-athenz Bjorncs/rewrite user principal to athenz | ||||
| * | | Improve error message | Bjørn Christian Seime | 2017-11-22 | 1 | -1/+1 |
| | | | |||||
| * | | Rename method to better indicate its function | Bjørn Christian Seime | 2017-11-22 | 1 | -2/+2 |
| | | | |||||
| * | | Rewrite user principal as Athenz principal | Bjørn Christian Seime | 2017-11-22 | 1 | -0/+24 |
| |/ | |||||
* / | Count prod only | Jon Bratseth | 2017-11-22 | 2 | -3/+8 |
|/ | |||||
* | Merge pull request #4231 from vespa-engine/jvenstad/ignore-PR-app-ownership | Jon Bratseth | 2017-11-22 | 1 | -1/+1 |
|\ | | | | | Do not send to default-pr applications | ||||
| * | Do not send to default-pr applications | Jon Marius Venstad | 2017-11-21 | 1 | -1/+1 |
| | | |||||
* | | Verify zones before storing anything | Jon Marius Venstad | 2017-11-22 | 4 | -6/+20 |
| | | |||||
* | | 12 hours instead of 1 | Jon Marius Venstad | 2017-11-21 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into jvenstad/application-locking-revised | Jon Marius Venstad | 2017-11-21 | 17 | -55/+435 |
|\ | |||||
| * | Nonfunctional changes only | Jon Bratseth | 2017-11-21 | 2 | -1/+9 |
| | | |||||
| * | Merge pull request #4202 from vespa-engine/bjorncs/athenz-bouncer-filter | Bjørn Christian Seime | 2017-11-21 | 4 | -17/+117 |
| |\ | | | | | | | Bjorncs/athenz bouncer filter | ||||
| | * | Send error response as application/json instead of html | Bjørn Christian Seime | 2017-11-20 | 3 | -24/+44 |
| | | | |||||
| | * | Add filter combining Athenz with user authentication filter | Bjørn Christian Seime | 2017-11-20 | 3 | -1/+81 |
| | | | |||||
| * | | Merge pull request #4215 from ↵ | Jon Bratseth | 2017-11-21 | 4 | -30/+57 |
| |\ \ | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/no-ownership-issues-for-non-production No longer file issues when no production deployments | ||||
| | * | | No longer file issues when no production deployments | Jon Marius Venstad | 2017-11-21 | 4 | -30/+57 |
| | | | | |||||
| * | | | Merge pull request #4213 from vespa-engine/mpolden/import-zone-api-v1 | Jon Bratseth | 2017-11-21 | 8 | -8/+253 |
| |\ \ \ | | |/ / | |/| | | Reimplement /zone/v1 | ||||
| | * | | Reimplement /zone/v1 | Martin Polden | 2017-11-21 | 8 | -8/+253 |
| | | | | |||||
* | | | | One author per line | Jon Marius Venstad | 2017-11-21 | 1 | -1/+2 |
| | | | | |||||
* | | | | Clean | Jon Marius Venstad | 2017-11-21 | 1 | -11/+4 |
| | | | | |||||
* | | | | Made accessors for Lock and LockedApplication more private | Jon Marius Venstad | 2017-11-21 | 10 | -98/+52 |
| | | | | |||||
* | | | | Committing to switch machines | Jon Marius Venstad | 2017-11-21 | 20 | -395/+472 |
|\| | | | |||||
| * | | | Expose issue ids for applications | Jon Marius Venstad | 2017-11-20 | 5 | -3/+18 |
| | | | | |||||
| * | | | Removed unused file — it was merged with an existing one instead | Jon Marius Venstad | 2017-11-20 | 1 | -53/+0 |
| | | | | |||||
| * | | | Update application metrics together with deployment metrics | Jon Marius Venstad | 2017-11-20 | 15 | -82/+208 |
| | |/ | |/| | |||||
| * | | Test response cleanup | Jon Marius Venstad | 2017-11-20 | 6 | -77/+38 |
| | | | |||||
| * | | Allow limited recursive, test it and use Builder for test requests | Jon Marius Venstad | 2017-11-20 | 4 | -289/+315 |
| | | | |||||
* | | | Committing to merge conflicts from master | Jon Marius Venstad | 2017-11-21 | 9 | -95/+70 |
| | | | |||||
* | | | Added new shiny things, like lockedIfPresent and idList | Jon Marius Venstad | 2017-11-18 | 3 | -65/+107 |
|/ / | |||||
* | | Use the leaf withs in the test as well | Jon Marius Venstad | 2017-11-17 | 1 | -4/+6 |
| | | |||||
* | | Merge pull request #4189 from ↵ | Jon Marius Venstad | 2017-11-17 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | vespa-engine/jvenstad/reduce-log-level-for-404-getting-endpoints Reduce to FINER | ||||
| * | | Fine, FINE; | Jon Marius Venstad | 2017-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Reduce to FINER | Jon Marius Venstad | 2017-11-17 | 1 | -1/+1 |
| |/ | |||||
* / | Hide sub-obejcts that aren't leaves, to reduce risk of coding errors' | Jon Marius Venstad | 2017-11-17 | 7 | -75/+89 |
|/ | |||||
* | Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deux | Jon Marius Venstad | 2017-11-17 | 11 | -137/+88 |
|\ | | | | | Jvenstad/deployment cleanup part deux | ||||
| * | Re-insert negation o_O | Jon Marius Venstad | 2017-11-17 | 1 | -1/+1 |
| | | |||||
| * | Removed redundant code | Jon Marius Venstad | 2017-11-17 | 1 | -7/+1 |
| | | |||||
| * | Reverted the two non-improvements | Jon Marius Venstad | 2017-11-17 | 2 | -9/+15 |
| | | |||||
| * | Resolved conflict | Jon Marius Venstad | 2017-11-17 | 13 | -98/+248 |
| |\ | |||||
| * | | More name changes | Jon Marius Venstad | 2017-11-16 | 5 | -18/+14 |
| | | | |||||
| * | | Added TODO: | Jon Marius Venstad | 2017-11-15 | 1 | -5/+5 |
| | | | |||||
| * | | More nitpicking | Jon Marius Venstad | 2017-11-15 | 5 | -36/+28 |
| | | |