summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test
Commit message (Expand)AuthorAgeFilesLines
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0214-18/+21
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-021-11/+99
|\
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-181-11/+99
| * Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3Jon Marius Venstad2017-12-141-17/+32
| |\
* | | Split Zones and renamed itJon Marius Venstad2017-12-161-4/+4
* | | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-151-2/+4
* | | Conflict resolvedJon Marius Venstad2017-12-144-3/+24
|\| |
| * | Merge pull request #4440 from vespa-engine/mpolden/remove-all-instances-on-de...Jon Bratseth2017-12-141-4/+21
| |\ \
| | * | Delete all instances on application deleteMartin Polden2017-12-141-4/+21
| * | | Expose assigned rotation in application APIMartin Polden2017-12-133-0/+3
| |/ /
* | / Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-1414-20/+14
| |/ |/|
* | Optional<Duration> againJon Marius Venstad2017-12-144-7/+2
* | Need new classes for hosted compilationJon Marius Venstad2017-12-121-3/+1
|\|
| * Merge pull request #4408 from vespa-engine/mpolden/enable-dns-updateMartin Polden2017-12-111-3/+1
| |\
| | * Revert "Log DNS update"Martin Polden2017-12-111-3/+1
* | | Added new secure config server uri stuffJon Marius Venstad2017-12-121-4/+6
* | | Reintroduced Optional for default region and made mock consistentJon Marius Venstad2017-12-124-5/+24
* | | DeploymentId beautificationJon Marius Venstad2017-12-121-4/+4
* | | Fix mock, move kibana stuff to hosted and add some docJon Marius Venstad2017-12-121-11/+11
* | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId)Jon Marius Venstad2017-12-111-7/+6
|/ /
* | 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-113-3/+177
|\|
| * Log DNS updateMartin Polden2017-12-111-1/+3
| * value() -> data()Martin Polden2017-12-082-5/+5
| * Remove DNS records for unassigned rotationsMartin Polden2017-12-083-3/+85
| * Ensure that global DNS always points to assigned rotationMartin Polden2017-12-081-2/+92
* | Replaced inheritance with delegationJon Marius Venstad2017-12-081-1/+1
* | Replace constructor with factoriesJon Marius Venstad2017-12-0811-39/+34
* | Replaced Zone with ZoneId two places where only that part was usedJon Marius Venstad2017-12-081-3/+3
* | Replaced instantiation of Zone with ZoneId where applicableJon Marius Venstad2017-12-0812-37/+42
* | Extract superclass with environment and regionJon Marius Venstad2017-12-085-14/+18
* | Revert "Factory constructor with region/env"Jon Marius Venstad2017-12-0811-32/+32
* | Factory constructor with region/envJon Marius Venstad2017-12-0811-32/+32
|/
* Update name service interfaceMartin Polden2017-12-061-3/+4
* Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-067-24/+24
* Add NToken to AthenzPrincipalBjørn Christian Seime2017-12-062-2/+3
* Remove reference to PrincipalToken from NTokenBjørn Christian Seime2017-12-063-23/+19
* Merge pull request #4360 from vespa-engine/mpolden/curator-lock-for-rotation-...Jon Bratseth2017-12-056-36/+42
|\
| * Use curator lock when assigning rotationMartin Polden2017-12-051-5/+9
| * Clean up test codeMartin Polden2017-12-055-31/+33
* | Revert "Replace usage of KeyService with SecretStore"Arnstein Ressem2017-12-051-4/+4
|/
* Fix a few TODOsMartin Polden2017-12-051-1/+1
* Shorten method namesMartin Polden2017-12-054-6/+5
* Merge pull request #4349 from vespa-engine/mortent/remove-keyserviceMorten Tokle2017-12-051-4/+4
|\
| * Replace usage of KeyService with SecretStoreMorten Tokle2017-11-301-4/+4
* | Cleanup authorization testing in ApplicationApiTestBjørn Christian Seime2017-12-043-109/+143
* | Introduce AthenzIdentity and AthenzUserBjørn Christian Seime2017-12-044-19/+19
|/
* Merge pull request #4309 from vespa-engine/mpolden/move-rotation-to-applicationMartin Polden2017-11-3011-283/+291
|\
| * Move rotation to applicationMartin Polden2017-11-2911-283/+291