aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11382 from vespa-engine/mpolden/avoid-duplicating-rotatio...Martin Polden2019-11-222-19/+37
|\
| * Log stale readMartin Polden2019-11-221-5/+15
| * Avoid duplicating endpoint URLsMartin Polden2019-11-221-14/+22
* | Merge pull request #11356 from vespa-engine/jvenstad/handle-dev-deployments-w...Martin Polden2019-11-213-41/+112
|\ \ | |/ |/|
| * Handle missing spec for instance to display jobs forJon Marius Venstad2019-11-193-40/+108
| * Test deployment view for user instance not in deployment specJon Marius Venstad2019-11-191-2/+5
* | Merge pull request #11370 from vespa-engine/mpolden/global-endpoint-in-rotati...Martin Polden2019-11-202-82/+141
|\ \
| * | Skip rotation assignment in rotation-less systemsMartin Polden2019-11-202-0/+29
| * | Extract RoutingPoliciesTesterMartin Polden2019-11-201-83/+113
* | | Keep cause of IOException in test http clientJon Marius Venstad2019-11-201-3/+2
|/ /
* | Merge pull request #11350 from vespa-engine/olaa/change-metering-intervalOla Aunrønning2019-11-191-1/+1
|\ \ | |/ |/|
| * Change metering interval to 1 minuteOla Aunrønning2019-11-191-1/+1
* | Include basic merge function for hosts with more than one applicationOla Aunrønning2019-11-191-1/+2
|/
* Merge pull request #11329 from vespa-engine/jvenstad/retry-deployment-deletio...Jon Marius Venstad2019-11-192-10/+27
|\
| * Retry deleting deployments when jobs endJon Marius Venstad2019-11-182-10/+27
* | Merge pull request #11333 from vespa-engine/jvenstad/more-descriptive-error-o...Jon Marius Venstad2019-11-181-2/+14
|\ \
| * | More descriptive error message, and use empty rather than EPOCH for timeJon Marius Venstad2019-11-181-2/+14
| |/
* | Merge pull request #11341 from vespa-engine/jvenstad/assign-failure-issues-to...Jon Marius Venstad2019-11-181-8/+8
|\ \
| * | Use application owner as assignee, if presentJon Marius Venstad2019-11-181-8/+8
| |/
* / Create routing policy for empty deployment specMartin Polden2019-11-182-42/+87
|/
* Merge pull request #11304 from vespa-engine/olaa/tagging-maintainerOla Aunrønning2019-11-1812-11/+142
|\
| * Map hostname to applicationIdOla Aunrønning2019-11-152-9/+9
| * Created maintainer for resource taggingOla Aunrønning2019-11-1412-11/+142
* | Merge pull request #11300 from vespa-engine/andreer/remove-direct-routing-fea...Andreas Eriksen2019-11-152-9/+0
|\ \
| * | remove direct routing feature flagsandreer2019-11-142-9/+0
* | | Merge pull request #11296 from vespa-engine/bjorncs/system-flags-handlerHåkon Hallingstad2019-11-141-1/+1
|\ \ \
| * | | Make class publicBjørn Christian Seime2019-11-141-1/+1
| | |/ | |/|
* | | Merge pull request #11257 from vespa-engine/bjorncs/system-flags-access-contr...Bjørn Christian Seime2019-11-142-3/+7
|\ \ \ | |_|/ |/| |
| * | Define access control '/system-flags/v1' dry-runBjørn Christian Seime2019-11-082-3/+7
* | | Don't set tester storage-type for nowJon Bratseth2019-11-131-0/+6
* | | Add NodeResources.storageTypeJon Bratseth2019-11-131-2/+2
| |/ |/|
* | Merge pull request #11252 from vespa-engine/jvenstad/instance-orchestrationJon Marius Venstad2019-11-1115-162/+291
|\ \
| * | Replace more JobStatus usagesJon Marius Venstad2019-11-1111-75/+179
| * | Update test which assumes test jobs must waitJon Marius Venstad2019-11-111-9/+6
| * | Consider all known runs when checking whether versions are verifiedJon Marius Venstad2019-11-116-78/+106
* | | Pick a deterministic job when there are ties for time of startJon Marius Venstad2019-11-112-3/+7
* | | Revert "Revert "Add a multi-instance app in deploynent api test""Jon Marius Venstad2019-11-112-7/+29
|/ /
* | Revert "Add a multi-instance app in deploynent api test"Jon Marius Venstad2019-11-092-29/+7
* | Add a multi-instance app in deploynent api testJon Marius Venstad2019-11-092-7/+29
* | Merge pull request #11238 from vespa-engine/bjorncs/system-flags-handlerBjørn Christian Seime2019-11-0811-0/+701
|\ \ | |/ |/|
| * Move dryrun deploy to separate pathBjørn Christian Seime2019-11-081-3/+4
| * Include error code from response in exception messageBjørn Christian Seime2019-11-081-16/+16
| * Rename 'ConfigserverFlagsTarget' -> 'ConfigServerFlagsTarget'Bjørn Christian Seime2019-11-081-2/+2
| * Implement /system-flags/v1 handlerBjørn Christian Seime2019-11-0711-0/+700
* | Distinguish between different errors in ControllerAuthroizationFilterBjørn Christian Seime2019-11-081-1/+1
* | Merge pull request #11246 from vespa-engine/smorgrav/user_api_add_rolesTorbjørn Smørgrav2019-11-081-21/+34
|\ \
| * | Break out once we have tested one administratortoby2019-11-081-0/+1
| * | Rename remove add methods to differentiate it to roles crud operationstoby2019-11-081-3/+3
| * | Add symetric removeRoles to user management apitoby2019-11-081-20/+31
| * | Add method and use this in already supported restapitoby2019-11-071-1/+2