summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5611 from vespa-engine/jvenstad/dep-orch-minorsMartin Polden2018-04-1717-83/+70
|\
| * Fixes to earlier commentsJon Marius Venstad2018-04-1717-83/+70
* | Merge pull request #5609 from vespa-engine/hmusum/remove-logic-for-choosing-b...Harald Musum2018-04-172-53/+2
|\ \ | |/ |/|
| * Remove logic for choosing between deploy and prepare-activateHarald Musum2018-04-172-53/+2
* | Merge pull request #5608 from vespa-engine/jvenstad/dep-orch-less-lockingJon Marius Venstad2018-04-171-3/+3
|\ \
| * | Lock only if presentJon Marius Venstad2018-04-171-1/+1
| * | Lock only when writing in computation of job queueJon Marius Venstad2018-04-171-3/+3
| |/
* / Remove usage of junit.frameworkJon Bratseth2018-04-171-2/+2
|/
* Remove method for getting errors in logHarald Musum2018-04-174-35/+0
* Merge pull request #5556 from vespa-engine/mpolden/remove-controllerdbMartin Polden2018-04-1610-351/+46
|\
| * Move all controller persistence to ZooKeeperMartin Polden2018-04-1210-351/+46
* | Merge pull request #5572 from vespa-engine/jvenstad/DO-unifiedJon Marius Venstad2018-04-1515-229/+151
|\ \
| * | Doc changesJon Marius Venstad2018-04-131-15/+9
| * | BuildService.isRunning and remove faulty data on exceptionsJon Marius Venstad2018-04-1313-222/+139
| * | Remove projectId when project is gone or we have no accessJon Marius Venstad2018-04-135-15/+21
| * | Expand BuildSystem interfaceJon Marius Venstad2018-04-131-0/+5
* | | Use rotation FQDN when checking health statusMartin Polden2018-04-135-14/+22
|/ /
* | Merge pull request #5553 from vespa-engine/jvenstad/DO-unifiedJon Marius Venstad2018-04-1215-242/+213
|\ \ | |/ |/|
| * Decide versions at triggering, filtering out downgradesJon Marius Venstad2018-04-1213-206/+174
| * Refactoring, no real changesJon Marius Venstad2018-04-109-64/+72
| * Blockers block individual parts of changeJon Marius Venstad2018-04-105-26/+21
* | Merge pull request #5532 from vespa-engine/mpolden/controller-cleanupJon Marius Venstad2018-04-103-98/+64
|\ \
| * | SimplifyMartin Polden2018-04-101-44/+20
| * | Clean up field namesMartin Polden2018-04-102-54/+44
* | | Add config server VIP URI to zone registryHarald Musum2018-04-101-0/+5
|/ /
* | Merge pull request #5528 from vespa-engine/jvenstad/DO-unifiedJon Marius Venstad2018-04-108-120/+115
|\|
| * Double negation error >_<Jon Marius Venstad2018-04-103-7/+7
| * Add and remove a TODOJon Marius Venstad2018-04-102-4/+4
| * Merge two tests and update response for anotherJon Marius Venstad2018-04-103-91/+13
| * Completion requires success unless no change possibleJon Marius Venstad2018-04-102-16/+26
| * Pick max of current and change versionsJon Marius Venstad2018-04-091-13/+11
| * Prod job complete if also if change is successful for itJon Marius Venstad2018-04-092-30/+30
| * Added test which fails, because we too eagerly upgradeJon Marius Venstad2018-04-091-1/+64
* | Use serialization in MemoryControllerDbMartin Polden2018-04-101-42/+14
* | Explicitly check for empty stepsMartin Polden2018-04-101-4/+1
* | Fix logicHarald Musum2018-04-101-1/+1
* | Enable deploy with one call in CD and for AWS zoneHarald Musum2018-04-101-2/+2
* | Merge pull request #5485 from vespa-engine/jvenstad/DO-unifiedJon Marius Venstad2018-04-0927-891/+613
|\|
| * SimplifyJon Marius Venstad2018-04-091-44/+12
| * Use executor service for triggeringJon Marius Venstad2018-04-093-13/+59
| * CleanupJon Marius Venstad2018-04-097-44/+44
| * Review comments, removed unused code and the executorJon Marius Venstad2018-04-098-165/+70
| * Add mock for tests!Jon Marius Venstad2018-04-091-0/+40
| * Expose job queue in web APIJon Marius Venstad2018-04-095-32/+38
| * ConflictsJon Marius Venstad2018-04-0921-731/+497
| * Move triggering to upper levelJon Marius Venstad2018-04-092-81/+72
* | Merge pull request #5481 from vespa-engine/bjorncs/jdisc-security-filtersBjørn Christian Seime2018-04-0916-494/+127
|\ \ | |/ |/|
| * Change package name and class name of Cors filtersBjørn Christian Seime2018-04-094-12/+12
| * Replace BouncyCastle use with vespa-athenz helpersBjørn Christian Seime2018-04-092-39/+17
| * Use CorsSecurityRequestFilterBase for controller filtersBjørn Christian Seime2018-04-099-111/+111