summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Allow principal to have both tenantadmin and deployer rolesMorten Tokle2019-04-162-4/+19
* Revert "Upgrade Jetty to 9.4.16"Bjørn Christian Seime2019-04-151-1/+1
* Merge pull request #9132 from vespa-engine/mpolden/include-rotation-id-in-deployMartin Polden2019-04-153-1/+24
|\
| * Include rotation ID in rotation CNAMEs passed to config serverMartin Polden2019-04-153-1/+24
* | Merge pull request #9131 from vespa-engine/bjorncs/jettyBjørn Christian Seime2019-04-151-1/+1
|\ \
| * | Upgrade Jetty to 9.4.16Bjørn Christian Seime2019-04-151-1/+1
* | | Merge pull request #9129 from vespa-engine/jvenstad/really-hide-system-in-rol...Jon Marius Venstad2019-04-1510-91/+67
|\ \ \
| * | | Call enforcer.allows rather than role.allows(..., enforcer)Jon Marius Venstad2019-04-151-2/+2
| * | | Make Roles staticJon Marius Venstad2019-04-153-22/+15
| * | | UserRoles -> RolesJon Marius Venstad2019-04-152-10/+10
| * | | Replace Roles with static factories in RoleJon Marius Venstad2019-04-159-68/+48
| * | | Use system from enforcer, not context, when enforcing policiesJon Marius Venstad2019-04-151-2/+5
| |/ /
* | | Merge pull request #9128 from vespa-engine/jvenstad/timeout-system-job-before...Jon Marius Venstad2019-04-151-3/+12
|\ \ \ | |/ / |/| |
| * | Explain timeoutJon Marius Venstad2019-04-151-1/+7
| * | Time out jobs before deployment expires, to get Vespa logJon Marius Venstad2019-04-151-2/+5
* | | Update test dataJon Marius Venstad2019-04-122-16/+37
* | | Order most important role members firstJon Marius Venstad2019-04-121-1/+2
* | | List implied roles as well, in user management APIJon Marius Venstad2019-04-121-4/+11
* | | List implied roles in ControllerJon Marius Venstad2019-04-121-0/+24
|/ /
* | Merge pull request #9107 from vespa-engine/jvenstad/application-deploy-key-APIMartin Polden2019-04-125-13/+46
|\ \
| * | Test extended patch functionality and pem deploy keys in particularJon Marius Venstad2019-04-121-1/+1
| * | Fix typoJon Marius Venstad2019-04-123-2/+18
| * | Allow PATCHing in a deployment key to an applicationJon Marius Venstad2019-04-121-10/+24
| * | Display deployment key in application responseJon Marius Venstad2019-04-121-0/+2
| * | Update serialised application.jsonJon Marius Venstad2019-04-121-1/+2
| * | Rename method for consistencyJon Marius Venstad2019-04-121-1/+1
| |/
* | Merge pull request #9101 from vespa-engine/jvenstad/get-test-vespalogsolaaun2019-04-121-20/+21
|\ \ | |/ |/|
| * Download logs only when deployment succeededJon Marius Venstad2019-04-121-20/+21
* | Merge pull request #9093 from vespa-engine/jvenstad/get-test-vespalogsJon Marius Venstad2019-04-1114-15/+118
|\|
| * Copy Vespa logs before deactivating test deploymentsJon Marius Venstad2019-04-118-7/+95
| * Add new copyVespaLogs step for test jobsJon Marius Venstad2019-04-116-3/+20
| * SimplifyJon Marius Venstad2019-04-111-5/+3
* | Merge pull request #9096 from vespa-engine/mpolden/deployment-metrics-npeJon Marius Venstad2019-04-111-9/+11
|\ \
| * | Verify that deployment still exists before storing metricsMartin Polden2019-04-111-9/+11
| |/
* | Merge pull request #9066 from vespa-engine/mpolden/public-endpoint-namesMartin Polden2019-04-1119-266/+605
|\ \
| * | Never include instance name in global endpointsMartin Polden2019-04-102-5/+6
| * | Update docMartin Polden2019-04-102-13/+12
| * | Hide legacy names in application APIMartin Polden2019-04-094-6/+1
| * | Add support for global endpoint names in public systemMartin Polden2019-04-0916-261/+605
* | | Merge pull request #9082 from vespa-engine/hakonhall/use-athenzidentity-inste...Håkon Hallingstad2019-04-116-18/+17
|\ \ \ | |_|/ |/| |
| * | More AthenzService -> AthenzIdentityHåkon Hallingstad2019-04-112-2/+2
| * | Use AthenzIdentity instead of AthensServiceHåkon Hallingstad2019-04-104-16/+15
* | | Merge pull request #9081 from vespa-engine/jvenstad/nodes-in-application-v4Jon Marius Venstad2019-04-117-8/+96
|\ \ \
| * | | Expose application nodes in application/v4Jon Marius Venstad2019-04-103-0/+72
| * | | Make ConfigServerMock actiavte nodes on deployment (nit)Jon Marius Venstad2019-04-101-1/+2
| * | | Support a few more fields in controller's NodeJon Marius Venstad2019-04-103-7/+22
| |/ /
* | | Fix typoJon Marius Venstad2019-04-101-1/+1
* | | Test that /api/user/v1 and /api/application/v4 worksJon Marius Venstad2019-04-101-0/+10
* | | Bind user and application APIs also to /api/... in testsJon Marius Venstad2019-04-102-6/+12
* | | Add /api optional prefix to user management apiJon Marius Venstad2019-04-102-24/+19
|/ /