summaryrefslogtreecommitdiffstats
path: root/controller-api
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4365 from ↵Morten Tokle2017-12-0617-0/+496
|\ | | | | | | | | vespa-engine/bjorncs/move-athenz-api-to-controller-api Bjorncs/move athenz api to controller api
| * 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
| | | | | | | | Add package-info with ExportPackage as well.
* | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxyBjørn Christian Seime2017-12-061-10/+4
|\ \ | |/ |/| Remove Context from proxy methods
| * 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 SecretStore
| * 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
| | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
* | Revert "Gjoranv/split parent2"gjoranv2017-11-301-1/+0
| |
* | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2gjoranv2017-11-301-0/+1
|\ \ | |/ |/| Gjoranv/split parent2
| * Split parent + container-dependency-versions from root pom.gjoranv2017-11-301-0/+1
| | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
| * Revert "Gjoranv/split parent"gjoranv2017-11-291-1/+0
| |
| * Split parent + container-dependency-versions from root pom.gjoranv2017-11-291-0/+1
| | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
* | Move rotation to applicationMartin Polden2017-11-292-0/+3
|/
* Add support for typeJon Marius Venstad2017-11-241-9/+27
|
* Merge branch 'master' into jvenstad/application-locking-revisedJon Marius Venstad2017-11-211-0/+1
|\
| * Reimplement /zone/v1Martin Polden2017-11-211-0/+1
| |
* | One author per lineJon Marius Venstad2017-11-211-1/+2
|/
* Resolved conflictJon Marius Venstad2017-11-172-0/+76
|\
| * Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-162-0/+76
| |
* | Added TODO:Jon Marius Venstad2017-11-151-0/+1
|/
* Merge pull request #4006 from vespa-engine/mpolden/add-key-service-mockBjørn Christian Seime2017-11-031-0/+13
|\ | | | | Add key service mock
| * Add key service mockMartin Polden2017-11-031-0/+13
| |
* | Return correct response code when there is a ConfigServerExceptionHarald Musum2017-11-031-0/+1
| |
* | Athenz now uses "user" as principal domain and "home" as personal domainBjørn Christian Seime2017-11-011-2/+2
|/
* Send system version with broken deploymentsJon Marius Venstad2017-10-302-3/+5
|
* Return empty contact list for unknown property ids in mockJon Marius Venstad2017-10-291-1/+1
|
* Export package.Jon Marius Venstad2017-10-271-0/+5
|
* Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headersJon Marius Venstad2017-10-271-1/+2
|\ | | | | Add copyright header
| * Add copyright headerJon Bratseth2017-10-271-1/+2
| |
* | Comments taken into accountJon Marius Venstad2017-10-265-3/+28
| |
* | Add missing copyright headersJon Marius Venstad2017-10-252-0/+2
| |
* | Expose property relevant URIs and contact lists at tenant/{tenant}/propertyJon Marius Venstad2017-10-251-3/+10
| |
* | Resolved ocnflictsJon Marius Venstad2017-10-2440-1363/+77
|\|
| * Revert "Rename TenantType.Athens -> TenantType.Athenz"Bjørn Christian Seime2017-10-231-1/+1
| | | | | | | | This reverts commit ce1da3698d732b9f8bc5033695512c049dd8b80b.
| * Rename TenantType.Athens -> TenantType.AthenzBjørn Christian Seime2017-10-191-1/+1
| |
| * Rename 'athens' -> 'athenz'Bjørn Christian Seime2017-10-171-2/+2
| | | | | | | | Rename private varibles/fields and test symbols from 'athens' to 'athenz'
| * Rename AthensDomainResponse -> AthenzDomainResponseBjørn Christian Seime2017-10-172-4/+4
| |
| * Rename AthensDomain -> AthenzDomainBjørn Christian Seime2017-10-178-27/+27
| |
| * Rename getName -> getNameSuffixBjørn Christian Seime2017-10-162-2/+2
| | | | | | | | | | getName was misleading and could be confused with the fully qualified name of the domain.
| * Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1620-751/+1
| |
| * Revert "Open-source Athenz integration for controller-server"Bjørn Christian Seime2017-10-1620-1/+751
| | | | | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c.
| * Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1620-751/+1
| |
| * Add getNodeList to configserverclienttoby2017-10-102-1/+44
| |
| * Improve documentation and get application lock when maintainging info and utilstoby2017-10-101-0/+2
| |
| * Fold cost api into the application API - take 1toby2017-10-1012-624/+0
| |
| * Add unit testtoby2017-10-103-4/+33
| |
| * Fix commenttoby2017-10-101-1/+1
| |