summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Remove getConfigServerUris from ZoneRegistryBjørn Christian Seime2018-01-091-5/+0
* 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-099-125/+290
|\
| * SuggestionJon Marius Venstad2018-01-093-23/+28
| * 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-0811-118/+275
* | Merge pull request #4567 from vespa-engine/mpolden/remove-stale-dns-recordsMorten Tokle2018-01-093-13/+15
|\ \
| * | Remove DNS records for unassigned rotationsMartin Polden2018-01-083-13/+15
* | | Remove getNodeList from ConfigServerClientBjørn Christian Seime2018-01-086-40/+155
|/ /
* | use LoggingRequestHandler.Context in constructorsArne Juul2018-01-057-28/+15
* | Revert "Use httpclient version matching zts-client"Bjørn Christian Seime2018-01-052-4/+44
* | Use httpclient version matching zts-clientBjørn Christian Seime2018-01-042-44/+4
* | Create X509HostnameVerifier adapter to verify Athenz identity in httpclientBjørn Christian Seime2018-01-041-1/+41
* | Revert "Use httpclient artifact provided by JDisc"Bjørn Christian Seime2018-01-041-5/+5
* | Use httpclient artifact provided by JDiscBjørn Christian Seime2018-01-041-5/+5
* | Merge pull request #4546 from vespa-engine/jvenstad/report-more-failing-apps-...Jon Bratseth2018-01-038-32/+34
|\ \
| * | 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-034-10/+8
| * | 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
* | | Provide Athenz identity of configservers in ZoneRegistryBjørn Christian Seime2018-01-031-0/+5
* | | Use https endpoint on config serverBjørn Christian Seime2018-01-033-7/+11
|/ /
* | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4""""Jon Marius Venstad2018-01-0331-73/+58
* | Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-0231-58/+73
|/
* Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-0231-73/+58
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0231-58/+73
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-027-68/+195
|\
| * Always retry hanging jobsJon Bratseth2017-12-182-35/+41
| * Compare identity, not principalBjørn Christian Seime2017-12-181-1/+1
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-182-20/+142
| * Use AthenzPrincipal to retrieve NToken (ensures that token is verified)Bjørn Christian Seime2017-12-181-4/+2
| * Revert "Revert "Bratseth/tensorflow models""Jon Bratseth2017-12-182-9/+10
| * Revert "Bratseth/tensorflow models"gjoranv2017-12-172-10/+9
| * Merge pull request #4438 from vespa-engine/bratseth/tensorflow-modelsJon Bratseth2017-12-172-9/+10
| |\
| | * Merge with masterJon Bratseth2017-12-1399-1857/+2042
| | |\
| | * | Nonfunctional changes onlyJon Bratseth2017-12-032-9/+10
| * | | Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3Jon Marius Venstad2017-12-149-74/+65
| |\ \ \
* | | | | Split Zones and renamed itJon Marius Venstad2017-12-162-6/+6
* | | | | Name change of local variableJon Marius Venstad2017-12-152-7/+7
* | | | | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-155-14/+14
* | | | | Conflict resolvedJon Marius Venstad2017-12-148-30/+114
|\| | | |
| * | | | Merge pull request #4440 from vespa-engine/mpolden/remove-all-instances-on-de...Jon Bratseth2017-12-142-24/+53
| |\ \ \ \