summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Catch the right exceptionJon Marius Venstad2018-10-242-9/+7
* Merge pull request #7400 from vespa-engine/mpolden/remove-pr-instancesMartin Polden2018-10-244-0/+92
|\
| * Remove PR instancesMartin Polden2018-10-224-0/+92
* | Merge pull request #7416 from vespa-engine/revert-7116-revert-7098-frodelu/co...Jon Bratseth2018-10-234-8/+21
|\ \
| * | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers a...Frode Lundgren2018-10-234-8/+21
| |/
* | Merge with masterJon Bratseth2018-10-2320-43/+150
|\ \
| * \ Merge pull request #7428 from vespa-engine/jvenstad/abort-running-deployment-...Jon Bratseth2018-10-233-3/+75
| |\ \
| | * | Abort internally run jobs whenever new application change is acceptedJon Marius Venstad2018-10-233-3/+75
| * | | Merge pull request #7395 from vespa-engine/mpolden/remove-prepareHarald Musum2018-10-231-3/+6
| |\ \ \ | | |/ / | |/| |
| | * | Update javadocMartin Polden2018-10-221-3/+6
| | |/
| * | Allow admins and operators to cancel hosted deployment jobsJon Marius Venstad2018-10-234-9/+30
| * | Expose whether an application is deployed internallyJon Marius Venstad2018-10-2311-11/+16
| * | Accept optional project id for new pipeline submissionsJon Marius Venstad2018-10-238-17/+23
| |/
* | Remove orhphan commentJon Bratseth2018-10-221-2/+0
* | Don't make other changes when a zone is suspendedJon Bratseth2018-10-224-11/+73
* | Test isSuspendedJon Bratseth2018-10-221-0/+23
* | Add suspended to application/v4Jon Bratseth2018-10-225-0/+47
|/
* Read certificate chainMorten Tokle2018-10-191-2/+3
* Merge pull request #7360 from vespa-engine/bratseth/handle-major-versionJon Bratseth2018-10-184-0/+50
|\
| * Don't upgrade if major version i pinnedJon Bratseth2018-10-184-0/+50
* | Add SSL provider for configuring controller HTTPS connectorMartin Polden2018-10-186-0/+255
|/
* Remove deprecated types from vespa-athenzBjørn Christian Seime2018-10-171-1/+1
* Merge pull request #7324 from vespa-engine/jvenstad/systemtest-framework-cleanupJon Marius Venstad2018-10-162-2/+30
|\
| * Content cluster, instead of storage clusterJon Marius Venstad2018-10-162-3/+3
| * Get list of storage clusters from config server, and add to test configJon Marius Venstad2018-10-162-2/+30
* | Revert 7315 revert 7274 olaaun/contact info maintainer feed to api (#7320)olaaun2018-10-167-43/+145
* | Revert "ContactInformationMaintainer now feeds to ContactInfoAPI instead of d...olaaun2018-10-157-145/+43
* | ContactInformationMaintainer now feeds to ContactInfoAPI instead of d… (#7274)olaaun2018-10-157-43/+145
|/
* Never downgrade system versionMartin Polden2018-10-1011-184/+241
* Avoid ZK read when checking maintainer systemMartin Polden2018-10-104-14/+57
* Remove unused injected classMartin Polden2018-10-101-2/+1
* Replaced Slime usage with String. Removed unused importsOla Aunrønning2018-10-093-15/+8
* Only use persistent contact info. Moved slime serialization. Several other fi...Ola Aunrønning2018-10-097-209/+62
* Added slime functionality to Contact,tests, and system check for MaintainerOla Aunrønning2018-10-086-31/+215
* Expect request body to be JSONOla Aunrønning2018-10-081-7/+27
* Added API for feeding and getting tenant contact infoOla Aunrønning2018-10-081-0/+162
* Fix test instead :)Jon Marius Venstad2018-10-081-16/+18
* Ignore unstable test for nowJon Marius Venstad2018-10-081-0/+2
* Merge pull request #7215 from vespa-engine/jvenstad/prune-job-run-historyJon Marius Venstad2018-10-066-32/+72
|\
| * Add unit testJon Marius Venstad2018-10-052-3/+29
| * Keep one less job, i.e., historyLength finished onesJon Marius Venstad2018-10-051-1/+1
| * Relax reaction to trying to modify inactive run, and simplifyJon Marius Venstad2018-10-051-15/+10
| * Limit run data and logs to a history of the 256 last onesJon Marius Venstad2018-10-053-5/+22
| * Use a SortedMap to communicate order of map entriesJon Marius Venstad2018-10-053-9/+11
* | Merge pull request #7216 from vespa-engine/mortent/new-copper-argos-reqsBjørn Christian Seime2018-10-051-2/+2
|\ \
| * | Implement role CSR requirementsMorten Tokle2018-10-051-2/+2
* | | Include detailed step information with all run responsesJon Marius Venstad2018-10-053-7/+162
* | | Remove pointless Optional and clean up API responseJon Marius Venstad2018-10-054-15/+19
| |/ |/|
* | Merge pull request #7197 from vespa-engine/smorgrav/expand_nameserviceTorbjørn Smørgrav2018-10-041-7/+10
|\ \
| * | Remove rests from a bad ideatoby2018-10-041-3/+1