Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4365 from ↵ | Morten Tokle | 2017-12-06 | 17 | -0/+496 |
|\ | | | | | | | | | vespa-engine/bjorncs/move-athenz-api-to-controller-api Bjorncs/move athenz api to controller api | ||||
| * | Add class for Athenz role token | Bjørn Christian Seime | 2017-12-06 | 1 | -0/+36 |
| | | |||||
| * | Move all Athenz API classes to controller-api | Bjørn Christian Seime | 2017-12-06 | 16 | -0/+460 |
| | | | | | | | | Add package-info with ExportPackage as well. | ||||
* | | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxy | Bjørn Christian Seime | 2017-12-06 | 1 | -10/+4 |
|\ \ | |/ |/| | Remove Context from proxy methods | ||||
| * | Remove Context from proxy methods | Valerij Fredriksen | 2017-12-05 | 1 | -10/+4 |
| | | |||||
* | | Revert "Replace usage of KeyService with SecretStore" | Arnstein Ressem | 2017-12-05 | 3 | -0/+36 |
|/ | |||||
* | Merge pull request #4349 from vespa-engine/mortent/remove-keyservice | Morten Tokle | 2017-12-05 | 3 | -36/+0 |
|\ | | | | | Replace usage of KeyService with SecretStore | ||||
| * | Replace usage of KeyService with SecretStore | Morten Tokle | 2017-11-30 | 3 | -36/+0 |
| | | |||||
* | | Add removeRecord to NameService | Martin Polden | 2017-12-04 | 4 | -22/+39 |
| | | |||||
* | | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-12-01 | 1 | -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" | gjoranv | 2017-11-30 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2 | gjoranv | 2017-11-30 | 1 | -0/+1 |
|\ \ | |/ |/| | Gjoranv/split parent2 | ||||
| * | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-30 | 1 | -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" | gjoranv | 2017-11-29 | 1 | -1/+0 |
| | | |||||
| * | Split parent + container-dependency-versions from root pom. | gjoranv | 2017-11-29 | 1 | -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 application | Martin Polden | 2017-11-29 | 2 | -0/+3 |
|/ | |||||
* | Add support for type | Jon Marius Venstad | 2017-11-24 | 1 | -9/+27 |
| | |||||
* | Merge branch 'master' into jvenstad/application-locking-revised | Jon Marius Venstad | 2017-11-21 | 1 | -0/+1 |
|\ | |||||
| * | Reimplement /zone/v1 | Martin Polden | 2017-11-21 | 1 | -0/+1 |
| | | |||||
* | | One author per line | Jon Marius Venstad | 2017-11-21 | 1 | -1/+2 |
|/ | |||||
* | Resolved conflict | Jon Marius Venstad | 2017-11-17 | 2 | -0/+76 |
|\ | |||||
| * | Maintainer which asks for regular confirmation of ownership | Jon Marius Venstad | 2017-11-16 | 2 | -0/+76 |
| | | |||||
* | | Added TODO: | Jon Marius Venstad | 2017-11-15 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #4006 from vespa-engine/mpolden/add-key-service-mock | Bjørn Christian Seime | 2017-11-03 | 1 | -0/+13 |
|\ | | | | | Add key service mock | ||||
| * | Add key service mock | Martin Polden | 2017-11-03 | 1 | -0/+13 |
| | | |||||
* | | Return correct response code when there is a ConfigServerException | Harald Musum | 2017-11-03 | 1 | -0/+1 |
| | | |||||
* | | Athenz now uses "user" as principal domain and "home" as personal domain | Bjørn Christian Seime | 2017-11-01 | 1 | -2/+2 |
|/ | |||||
* | Send system version with broken deployments | Jon Marius Venstad | 2017-10-30 | 2 | -3/+5 |
| | |||||
* | Return empty contact list for unknown property ids in mock | Jon Marius Venstad | 2017-10-29 | 1 | -1/+1 |
| | |||||
* | Export package. | Jon Marius Venstad | 2017-10-27 | 1 | -0/+5 |
| | |||||
* | Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headers | Jon Marius Venstad | 2017-10-27 | 1 | -1/+2 |
|\ | | | | | Add copyright header | ||||
| * | Add copyright header | Jon Bratseth | 2017-10-27 | 1 | -1/+2 |
| | | |||||
* | | Comments taken into account | Jon Marius Venstad | 2017-10-26 | 5 | -3/+28 |
| | | |||||
* | | Add missing copyright headers | Jon Marius Venstad | 2017-10-25 | 2 | -0/+2 |
| | | |||||
* | | Expose property relevant URIs and contact lists at tenant/{tenant}/property | Jon Marius Venstad | 2017-10-25 | 1 | -3/+10 |
| | | |||||
* | | Resolved ocnflicts | Jon Marius Venstad | 2017-10-24 | 40 | -1363/+77 |
|\| | |||||
| * | Revert "Rename TenantType.Athens -> TenantType.Athenz" | Bjørn Christian Seime | 2017-10-23 | 1 | -1/+1 |
| | | | | | | | | This reverts commit ce1da3698d732b9f8bc5033695512c049dd8b80b. | ||||
| * | Rename TenantType.Athens -> TenantType.Athenz | Bjørn Christian Seime | 2017-10-19 | 1 | -1/+1 |
| | | |||||
| * | Rename 'athens' -> 'athenz' | Bjørn Christian Seime | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | Rename private varibles/fields and test symbols from 'athens' to 'athenz' | ||||
| * | Rename AthensDomainResponse -> AthenzDomainResponse | Bjørn Christian Seime | 2017-10-17 | 2 | -4/+4 |
| | | |||||
| * | Rename AthensDomain -> AthenzDomain | Bjørn Christian Seime | 2017-10-17 | 8 | -27/+27 |
| | | |||||
| * | Rename getName -> getNameSuffix | Bjørn Christian Seime | 2017-10-16 | 2 | -2/+2 |
| | | | | | | | | | | getName was misleading and could be confused with the fully qualified name of the domain. | ||||
| * | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 20 | -751/+1 |
| | | |||||
| * | Revert "Open-source Athenz integration for controller-server" | Bjørn Christian Seime | 2017-10-16 | 20 | -1/+751 |
| | | | | | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c. | ||||
| * | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 20 | -751/+1 |
| | | |||||
| * | Add getNodeList to configserverclient | toby | 2017-10-10 | 2 | -1/+44 |
| | | |||||
| * | Improve documentation and get application lock when maintainging info and utils | toby | 2017-10-10 | 1 | -0/+2 |
| | | |||||
| * | Fold cost api into the application API - take 1 | toby | 2017-10-10 | 12 | -624/+0 |
| | | |||||
| * | Add unit test | toby | 2017-10-10 | 3 | -4/+33 |
| | | |||||
| * | Fix comment | toby | 2017-10-10 | 1 | -1/+1 |
| | |