summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-certBjørn Christian Seime2017-12-115-9/+219
|\
| * Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-112-0/+86
| * Make credentials expiry configurableBjørn Christian Seime2017-12-083-6/+14
| * Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-074-6/+122
* | More Zone -> ZoneIdJon Marius Venstad2017-12-111-2/+2
* | Changed to ZoneId in DnsMaintainerTest as wellJon Marius Venstad2017-12-111-2/+3
* | Need to change new code as wellJon Marius Venstad2017-12-119-23/+283
|\ \
| * | Log DNS updateMartin Polden2017-12-112-4/+5
| * | Quote values in log messageMartin Polden2017-12-111-2/+4
| * | value() -> data()Martin Polden2017-12-083-6/+6
| * | Remove DNS records for unassigned rotationsMartin Polden2017-12-088-19/+178
| * | Ensure that global DNS always points to assigned rotationMartin Polden2017-12-082-4/+102
* | | Fixed scala typeJon Marius Venstad2017-12-081-3/+5
* | | Replaced inheritance with delegationJon Marius Venstad2017-12-081-1/+1
* | | Replace constructor with factoriesJon Marius Venstad2017-12-0815-55/+47
* | | Replaced Zone with ZoneId two places where only that part was usedJon Marius Venstad2017-12-082-29/+23
* | | Replaced instantiation of Zone with ZoneId where applicableJon Marius Venstad2017-12-0819-67/+71
* | | Extract superclass with environment and regionJon Marius Venstad2017-12-0818-65/+74
* | | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-0815-47/+48
* | | Factory constructor with region/envJon Marius Venstad2017-12-0815-48/+47
|/ /
* | Merge pull request #4370 from vespa-engine/mpolden/update-name-service-interfaceMartin Polden2017-12-082-5/+8
|\ \ | |/ |/|
| * Update name service interfaceMartin Polden2017-12-062-5/+8
* | Ignore ocnfigserver versios in AWSJon Marius Venstad2017-12-071-3/+5
|/
* Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-0639-550/+98
* Add NToken to AthenzPrincipalBjørn Christian Seime2017-12-065-6/+20
* remove reference ZMSClientException/ZTSClientExceptionBjørn Christian Seime2017-12-065-16/+14
* Remove reference to PrincipalToken from NTokenBjørn Christian Seime2017-12-067-156/+51
* Merge pull request #4360 from vespa-engine/mpolden/curator-lock-for-rotation-...Jon Bratseth2017-12-0510-66/+108
|\
| * Use curator lock when assigning rotationMartin Polden2017-12-055-35/+75
| * Clean up test codeMartin Polden2017-12-055-31/+33
* | Revert "Replace usage of KeyService with SecretStore"Arnstein Ressem2017-12-053-16/+16
|/
* Merge pull request #4356 from vespa-engine/mpolden/remove-rotations-migrationMorten Tokle2017-12-0516-129/+43
|\
| * Remove unused methodMartin Polden2017-12-051-4/+0
| * Remove rotations from ControllerDbMartin Polden2017-12-053-66/+4
| * Fix a few TODOsMartin Polden2017-12-053-20/+10
| * Shorten method namesMartin Polden2017-12-0513-40/+30
* | Merge pull request #4358 from vespa-engine/bjorncs/fixMorten Tokle2017-12-051-2/+2
|\ \ | |/ |/|
| * Fix invalid id bug introduced after recent refactoringBjørn Christian Seime2017-12-051-2/+2
* | Merge pull request #4349 from vespa-engine/mortent/remove-keyserviceMorten Tokle2017-12-053-16/+16
|\ \ | |/ |/|
| * Replace usage of KeyService with SecretStoreMorten Tokle2017-11-303-16/+16
* | Merge pull request #4342 from vespa-engine/bjorncs/enforce-athenz-principalMorten Tokle2017-12-0525-279/+398
|\ \
| * | Remove token signature from NToken.toString()Bjørn Christian Seime2017-12-041-1/+1
| * | Cleanup authorization testing in ApplicationApiTestBjørn Christian Seime2017-12-043-109/+143
| * | Introduce AthenzIdentity and AthenzUserBjørn Christian Seime2017-12-0422-165/+248
| * | The principal is always an AthenzPrincipalBjørn Christian Seime2017-12-041-4/+6
* | | Shorten log messageMartin Polden2017-12-041-1/+3
* | | Add removeRecord to NameServiceMartin Polden2017-12-041-1/+1
|/ /
* | Merge pull request #4335 from vespa-engine/mpolden/revert-log-level-changeMorten Tokle2017-12-041-1/+1
|\ \
| * | Revert "Reduce to FINER"Martin Polden2017-12-041-1/+1
* | | Split parent + container-dependency-versions from root pom.gjoranv2017-12-011-0/+1
|/ /