summaryrefslogtreecommitdiffstats
path: root/controller-api
Commit message (Expand)AuthorAgeFilesLines
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-028-206/+9
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-027-69/+206
|\
| * Add dependency on container-devBjørn Christian Seime2017-12-181-66/+1
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-181-1/+1
| * Make NToken optional in AthenzPrincipalBjørn Christian Seime2017-12-181-2/+7
| * Verify that certificate is not a role certificateBjørn Christian Seime2017-12-181-1/+9
| * Move logic from determing Athenz identity from x509 certificate to AthenzUtilsBjørn Christian Seime2017-12-182-15/+21
| * Add hostname verifier that verifies CN in Athenz x509 certificatesBjørn Christian Seime2017-12-153-0/+150
| * Add utility method to create Athenz identity from stringBjørn Christian Seime2017-12-152-0/+33
* | Split Zones and renamed itJon Marius Venstad2017-12-166-60/+77
* | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-153-14/+80
* | Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-146-8/+122
|/
* Optional<Duration> againJon Marius Venstad2017-12-141-2/+2
* Correct deprecation messageJon Marius Venstad2017-12-121-1/+1
* Need new classes for hosted compilationJon Marius Venstad2017-12-124-0/+72
|\
| * Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-121-0/+14
| * Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-123-0/+58
| * Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient"Arnstein Ressem2017-12-114-72/+0
| * Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-certBjørn Christian Seime2017-12-114-0/+72
| |\
| | * Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-111-0/+14
| | * Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-073-0/+58
* | | Added new secure config server uri stuffJon Marius Venstad2017-12-121-1/+8
* | | Reintroduced Optional for default region and made mock consistentJon Marius Venstad2017-12-122-3/+3
* | | DeploymentId beautificationJon Marius Venstad2017-12-121-25/+23
* | | Fix mock, move kibana stuff to hosted and add some docJon Marius Venstad2017-12-121-4/+21
* | | More simplificationsJon Marius Venstad2017-12-111-1/+2
* | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneIdJon Marius Venstad2017-12-111-3/+3
* | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId)Jon Marius Venstad2017-12-111-2/+2
|/ /
* | Need to change new code as wellJon Marius Venstad2017-12-113-10/+16
|\ \
| * | value() -> data()Martin Polden2017-12-082-3/+3
| * | Ensure that global DNS always points to assigned rotationMartin Polden2017-12-082-7/+13
* | | Remove unused ZoneIdJon Marius Venstad2017-12-081-13/+0
* | | Replace constructor with factoriesJon Marius Venstad2017-12-081-2/+2
* | | Replaced instantiation of Zone with ZoneId where applicableJon Marius Venstad2017-12-081-1/+1
* | | Extract superclass with environment and regionJon Marius Venstad2017-12-083-10/+10
* | | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-081-1/+1
* | | Factory constructor with region/envJon Marius Venstad2017-12-081-1/+1
|/ /
* / Update name service interfaceMartin Polden2017-12-065-14/+129
|/
* Merge pull request #4365 from vespa-engine/bjorncs/move-athenz-api-to-control...Morten Tokle2017-12-0617-0/+496
|\
| * Add class for Athenz role tokenBjørn Christian Seime2017-12-061-0/+36
| * Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-0616-0/+460
* | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxyBjørn Christian Seime2017-12-061-10/+4
|\ \ | |/ |/|
| * Remove Context from proxy methodsValerij Fredriksen2017-12-051-10/+4
* | Revert "Replace usage of KeyService with SecretStore"Arnstein Ressem2017-12-053-0/+36
|/
* Merge pull request #4349 from vespa-engine/mortent/remove-keyserviceMorten Tokle2017-12-053-36/+0
|\
| * Replace usage of KeyService with SecretStoreMorten Tokle2017-11-303-36/+0
* | Add removeRecord to NameServiceMartin Polden2017-12-044-22/+39
* | Split parent + container-dependency-versions from root pom.gjoranv2017-12-011-0/+1
* | Revert "Gjoranv/split parent2"gjoranv2017-11-301-1/+0
* | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2gjoranv2017-11-301-0/+1
|\ \ | |/ |/|