summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3911 from vespa-engine/bratseth/dont-record-component-tri...Jon Bratseth2017-10-261-1/+3
|\
| * Correct comment typoJon Bratseth2017-10-261-1/+1
| * We never trigger component: Remove those eventsJon Bratseth2017-10-261-1/+3
* | Don't allow delete with non-prod deploymentsJon Bratseth2017-10-262-2/+2
|/
* Only consider production deploymentsJon Bratseth2017-10-264-23/+26
* Remove also if no zoneJon Bratseth2017-10-261-3/+3
* Merge pull request #3900 from vespa-engine/bratseth/remove-jobs-for-removed-d...Jon Bratseth2017-10-264-61/+59
|\
| * Clearer logicJon Bratseth2017-10-261-2/+2
| * Clearer logicJon Bratseth2017-10-261-3/+4
| * Minor improvementsJon Bratseth2017-10-263-52/+56
| * Nonfunctional changes onlyJon Bratseth2017-10-262-8/+1
* | Improve logging during tenant migration to AthenzBjørn Christian Seime2017-10-261-2/+4
|/
* Always re-read application inside lockJon Bratseth2017-10-254-13/+29
* Don't cache ZMS client instanceBjørn Christian Seime2017-10-241-4/+3
* Merge pull request #3848 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-233-3/+3
|\
| * Revert "Rename TenantType.Athens -> TenantType.Athenz"Bjørn Christian Seime2017-10-233-3/+3
* | Merge pull request #3841 from vespa-engine/bratseth/handle-missing-jobstatusMartin Polden2017-10-231-0/+1
|\ \
| * | Handle missing job statusJon Bratseth2017-10-231-0/+1
| |/
* / Print message, avoid stack trace in logHarald Musum2017-10-231-1/+2
|/
* Merge pull request #3825 from vespa-engine/bratseth/dont-parallel-triggerMartin Polden2017-10-202-23/+50
|\
| * Disallow parallel triggeringJon Bratseth2017-10-192-23/+50
* | Rename TenantType.Athens -> TenantType.AthenzBjørn Christian Seime2017-10-193-3/+3
* | Fix provision id lockValerij Fredriksen2017-10-191-1/+2
* | Merge pull request #3796 from vespa-engine/jvenstad/catch-metrics-fetching-er...Jon Marius Venstad2017-10-181-10/+13
|\ \
| * | As requested.Jon Marius Venstad2017-10-181-2/+2
| * | Cleaner codeJon Marius Venstad2017-10-171-10/+13
* | | Merge pull request #3788 from vespa-engine/bratseth/dont-remove-recall-neutra...Jon Bratseth2017-10-182-2/+2
|\ \ \
| * | | Nonfunctional changes onlyJon Bratseth2017-10-181-1/+1
| * | | Merge with masterJon Bratseth2017-10-177-30/+100
| |\ \ \
| * | | | Don't remove OR terms which contributes to rankJon Bratseth2017-10-172-8/+11
| * | | | Remove temporary lineJon Bratseth2017-10-171-1/+0
| * | | | Nonfunctional changes onlyJon Bratseth2017-10-171-0/+1
* | | | | Merge branch 'master' into smorgrav/cost_npetoby2017-10-186-37/+43
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3812 from vespa-engine/bratseth/catch-missing-zoneTorbjørn Smørgrav2017-10-181-5/+9
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Catch more errors and warnJon Bratseth2017-10-181-5/+9
| * | | | | Warn when using deprecated authorization validationBjørn Christian Seime2017-10-182-1/+3
| |/ / / /
| * | | | Rename Athens->AthenzBjørn Christian Seime2017-10-185-31/+31
* | | | | Avoid NPE when cluster utilizations are updated but not cluster infotoby2017-10-182-2/+12
|/ / / /
* | | | Merge pull request #3801 from vespa-engine/bjorncs/athenz-migrationgjoranv2017-10-181-5/+9
|\ \ \ \
| * | | | Only create Athenz resource group once for each appliation nameBjørn Christian Seime2017-10-181-5/+9
| |/ / /
* | | | Merge pull request #3787 from vespa-engine/bjorncs/athenzMorten Tokle2017-10-1818-124/+124
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename 'athens' -> 'athenz'Bjørn Christian Seime2017-10-174-30/+30
| * | | Rename AthensDbMock -> AthenzDbMockBjørn Christian Seime2017-10-174-17/+17
| * | | Rename AthensDomain -> AthenzDomainBjørn Christian Seime2017-10-1717-88/+88
| |/ /
* | | Merge pull request #3789 from vespa-engine/hmusum/add-persisted-setting-for-i...Harald Musum2017-10-176-17/+73
|\ \ \ | |_|/ |/| |
| * | Add persistent setting for ignoring confidence calulationsHarald Musum2017-10-176-17/+73
| |/
* / Ignore timeouts (retried later anyway) and reduce locking timeJon Marius Venstad2017-10-171-8/+25
|/
* Serverpool in ZK (#3764)Valerij Fredriksen2017-10-171-3/+35
* Merge pull request #3772 from vespa-engine/bjorncs/athenz-migrationJon Bratseth2017-10-171-1/+1
|\
| * Method should be PUT, not POSTBjørn Christian Seime2017-10-161-1/+1