aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src
Commit message (Expand)AuthorAgeFilesLines
* Remove sandbox filtering in /user/v1/userValerij Fredriksen2019-12-102-19/+11
* Merge pull request #11525 from vespa-engine/freva/add-api-prefix-to-deploymen...Valerij Fredriksen2019-12-093-7/+8
|\
| * Add testValerij Fredriksen2019-12-062-1/+2
| * Add optional /api prefix to /deployment/v1 APIValerij Fredriksen2019-12-061-6/+6
* | Merge pull request #11489 from vespa-engine/ogronnesby/check-meterable-statesØyvind Grønnesby2019-12-092-5/+61
|\ \
| * | Make comment on Node State be more clearØyvind Grønnesby2019-12-051-1/+1
| * | Revert change to node repo mock and use different method to add nodesØyvind Grønnesby2019-12-032-5/+2
| * | Only include node states that are meterable in meteringØyvind Grønnesby2019-12-033-6/+65
* | | Only remove unused CNAMEs when removing obsolete policiesHarald Musum2019-12-061-2/+9
| |/ |/|
* | Add /api/athenz/v1 bindingValerij Fredriksen2019-12-051-0/+1
* | Support optional /api prefix for /athenz/v1Valerij Fredriksen2019-12-052-3/+4
* | Fix invalid operation type for failing flag deletesBjørn Christian Seime2019-12-031-1/+1
* | Merge pull request #11476 from vespa-engine/hakonhall/make-parent-host-not-re...Håkon Hallingstad2019-12-031-21/+18
|\ \
| * | Make parent-host-not-ready warning more user-friendlyHåkon Hallingstad2019-12-021-21/+18
* | | Merge pull request #11481 from vespa-engine/bjorncs/always-force-deleteHåkon Hallingstad2019-12-031-1/+1
|\ \ \
| * | | Always set force=true for flag data deletesBjørn Christian Seime2019-12-031-1/+1
| | |/ | |/|
* | | Merge pull request #11480 from vespa-engine/freva/user-api-fixesValerij Fredriksen2019-12-035-8/+21
|\ \ \ | |/ / |/| |
| * | Include isPublic in responseValerij Fredriksen2019-12-034-0/+5
| * | Include reader role in responseValerij Fredriksen2019-12-034-8/+16
* | | Merge pull request #11470 from vespa-engine/jvenstad/remove-old-job-statusJon Marius Venstad2019-12-0334-1558/+470
|\ \ \ | |/ / |/| |
| * | Handle removal of job typesJon Marius Venstad2019-12-031-4/+4
| * | Allow skipping system and staging tests with skipTests parameter on triggeringJon Marius Venstad2019-12-026-12/+48
| * | Remove old JobStatus, JobList and DeploymentStatusJon Marius Venstad2019-12-0216-1008/+70
| * | Update testsJon Marius Venstad2019-12-0212-222/+116
| * | Remove job pause again when triggering a jobJon Marius Venstad2019-12-021-2/+6
| * | Remove last usages of old JobStatus (except job pause)Jon Marius Venstad2019-12-024-75/+38
| * | Even more usages replacedJon Marius Venstad2019-12-026-152/+105
| * | More new JobList and coJon Marius Venstad2019-12-024-99/+96
| * | Use relative path to appease IntelliJJon Marius Venstad2019-12-021-2/+3
* | | Include changes from #11407Valerij Fredriksen2019-12-029-29/+83
* | | Add /user/v1/userValerij Fredriksen2019-12-027-18/+355
* | | Move UserApiHandler to common services.xmlValerij Fredriksen2019-12-022-6/+5
* | | Refactor tester code to create cloud tenantsValerij Fredriksen2019-12-026-32/+56
|/ /
* | Restore public API for old ContainerModelBuilderJon Marius Venstad2019-12-021-2/+2
* | Revert "Revert "Jvenstad/test steps in deployment spec""Jon Marius Venstad2019-12-024-11/+8
* | Revert "Jvenstad/test steps in deployment spec"Valerij Fredriksen2019-11-294-8/+11
* | Merge pull request #11456 from vespa-engine/jvenstad/test-steps-in-deployment...Jon Bratseth2019-11-294-11/+8
|\ \
| * | Introduce DeclaredTest and Steps, and ParallelZones -> ParallelSteps extends ...Jon Marius Venstad2019-11-281-0/+1
| * | Rename deploysTo -> concerns in DeploymentSpec.Step, and includes -> deploysToJon Marius Venstad2019-11-284-11/+7
* | | Merge pull request #11453 from vespa-engine/freva/add-all-accessible-tenantsValerij Fredriksen2019-11-292-22/+14
|\ \ \
| * | | Add all accessible tenantsValerij Fredriksen2019-11-292-22/+14
| | |/ | |/|
* / | Preserve DNS records for inactive load balancersMartin Polden2019-11-298-33/+54
|/ /
* | Add unit test for result mergingBjørn Christian Seime2019-11-281-0/+35
* | Split deduplication logic into separate methodsBjørn Christian Seime2019-11-281-13/+22
* | Merge identical errors with different targetsBjørn Christian Seime2019-11-281-17/+57
* | Rename 'FlagDataOperation' -> 'FlagDataChangeWithoutTarget'Bjørn Christian Seime2019-11-281-7/+7
|/
* Remove unintentional single quoteBjørn Christian Seime2019-11-271-1/+1
* Remove target from error messages to allow errors to be de-duplicatedBjørn Christian Seime2019-11-271-12/+11
* Fix bug in wire conversionBjørn Christian Seime2019-11-272-0/+38
* Revert "Fix bug in wire conversion"Bjørn Christian Seime2019-11-272-38/+0