summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Revert "Olaaun/metric maintaier use api (#7402)" (#7461)olaaun2018-10-266-188/+126
* Olaaun/metric maintaier use api (#7402)olaaun2018-10-266-126/+188
* Batch log calls that go to ZK when trivialJon Marius Venstad2018-10-252-16/+34
* Merge pull request #7450 from vespa-engine/jvenstad/log-adjustmentsJon Marius Venstad2018-10-253-5/+4
|\
| * Sort chunk ids by numerical orderJon Marius Venstad2018-10-251-1/+2
| * Use smaller chunks for logs to reduce ZK traffic (just in case)Jon Marius Venstad2018-10-251-1/+1
| * Indicate application, job and step in Vespa log (always the intention)Jon Marius Venstad2018-10-251-3/+1
* | Remove obsolete testMartin Polden2018-10-252-42/+0
* | Remove obsolete filterMartin Polden2018-10-2512-28/+6
* | Revert "Remove PR instances"Martin Polden2018-10-254-92/+0
* | Merge pull request #7444 from vespa-engine/mpolden/controller-aclsMartin Polden2018-10-252-4/+2
|\ \
| * | Remove unused parameterMartin Polden2018-10-252-4/+2
| |/
* | Merge pull request #7443 from vespa-engine/mpolden/remove-unused-apiJon Marius Venstad2018-10-253-41/+4
|\ \ | |/ |/|
| * Remove unused test responseMartin Polden2018-10-252-8/+1
| * Remove unused API pathMartin Polden2018-10-252-33/+3
* | Added API for updating metrics on controller (#7378)olaaun2018-10-253-0/+313
* | Merge pull request #7436 from vespa-engine/bjorncs/athenz-okta-tenancyMorten Tokle2018-10-2526-632/+381
|\ \
| * | Remove unused parameters from athenz.defBjørn Christian Seime2018-10-241-29/+0
| * | Create Athenz tenancy using OktaBjørn Christian Seime2018-10-2424-499/+381
| * | Remove UserAuthWithAthenzPrincipalFilterBjørn Christian Seime2018-10-181-104/+0
* | | 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