summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main
Commit message (Expand)AuthorAgeFilesLines
* Move AthenzIdentityVerifier to tls packageBjørn Christian Seime2018-01-181-1/+1
* Add builder helper for SSLContext in vespa-athenzBjørn Christian Seime2018-01-181-59/+6
* Revert "Add builder helper for SSLContext in vespa-athenz"Harald Musum2018-01-171-6/+59
* Add builder helper for SSLContext in vespa-athenzBjørn Christian Seime2018-01-171-59/+6
* Move Athenz types from controller-api to vespa-athenzBjørn Christian Seime2018-01-1718-65/+67
* Merge pull request #4687 from vespa-engine/mpolden/source-revision-in-job-reportMorten Tokle2018-01-175-22/+25
|\
| * Add source revision to job reportMartin Polden2018-01-162-2/+18
| * Remove dead codeMartin Polden2018-01-153-20/+7
* | Make staticBjørn Christian Seime2018-01-171-2/+2
* | Handle empty responsesBjørn Christian Seime2018-01-171-2/+16
* | Add logging of failures in ConfigServerRestExecutorImplBjørn Christian Seime2018-01-171-10/+13
* | Use EntityUtils.toStringBjørn Christian Seime2018-01-171-15/+3
* | Change useragent to better distinguish from other clientsBjørn Christian Seime2018-01-171-1/+1
* | Move AthenzDomain to vespa-athenzBjørn Christian Seime2018-01-1613-48/+48
* | Revert "Move AthenzDomain to vespa-athenz"Bjørn Christian Seime2018-01-1513-48/+48
* | Merge pull request #4622 from vespa-engine/bjorncs/vespa-athenzBjørn Christian Seime2018-01-1513-48/+48
|\ \ | |/ |/|
| * Move AthenzDomain to vespa-athenzBjørn Christian Seime2018-01-1113-48/+48
* | Remove outdated controller root handlerMartin Polden2018-01-121-93/+0
* | ZoneV2 copy method override headerValerij Fredriksen2018-01-121-5/+6
|/
* Provide secure configserver uris from application v4 apiBjørn Christian Seime2018-01-092-10/+3
* Add simple security filters that returns 403 forbiddenBjørn Christian Seime2018-01-091-0/+23
* Remove unused classesBjørn Christian Seime2018-01-092-49/+0
* Merge pull request #4570 from vespa-engine/bratseth/shortcut-unnecessary-depl...Jon Marius Venstad2018-01-094-76/+122
|\
| * SuggestionJon Marius Venstad2018-01-091-21/+26
| * Only progress if the previous job succeedsJon Bratseth2018-01-091-12/+8
| * Handle failing stagingtestJon Bratseth2018-01-081-16/+23
| * Update javadocJon Bratseth2018-01-081-1/+1
| * Nonfunctional changeJon Bratseth2018-01-081-1/+1
| * More robust upgradingJon Bratseth2018-01-084-67/+105
* | Merge pull request #4567 from vespa-engine/mpolden/remove-stale-dns-recordsMorten Tokle2018-01-092-8/+7
|\ \
| * | Remove DNS records for unassigned rotationsMartin Polden2018-01-082-8/+7
* | | Remove getNodeList from ConfigServerClientBjørn Christian Seime2018-01-082-15/+28
|/ /
* | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-057-28/+15
* | Revert "Use httpclient version matching zts-client"Bjørn Christian Seime2018-01-051-2/+43
* | Use httpclient version matching zts-clientBjørn Christian Seime2018-01-041-43/+2
* | Create X509HostnameVerifier adapter to verify Athenz identity in httpclientBjørn Christian Seime2018-01-041-1/+41
* | Merge pull request #4546 from vespa-engine/jvenstad/report-more-failing-apps-...Jon Bratseth2018-01-037-31/+33
|\ \
| * | Fix names and simplify somethingJon Marius Venstad2018-01-033-6/+4
| * | Remove ugly methodJon Marius Venstad2018-01-034-15/+13
| * | Remove redundant condition (and parameters) for ApplicationList filterJon Marius Venstad2018-01-033-9/+7
| * | List all applications failing upgrade in issue;Jon Marius Venstad2018-01-032-4/+12
* | | Fix bug when creating zone idHarald Musum2018-01-031-1/+1
* | | Remove reference to deleted typeBjørn Christian Seime2018-01-031-5/+0
* | | Use TLS with Athenz in ConfigServerRestExecutorBjørn Christian Seime2018-01-032-8/+33
* | | Use https endpoint on config serverBjørn Christian Seime2018-01-032-2/+10
|/ /
* | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-0317-52/+40
* | Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-0217-40/+52
|/
* Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-0217-52/+40
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0217-40/+52
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-026-57/+96
|\