summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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-179-36/+156
| |\ \ \ \ \
| * | | | | | 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-188-39/+45
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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-187-33/+33
* | | | | | | 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-1824-189/+189
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Rename 'athens' -> 'athenz'Bjørn Christian Seime2017-10-178-70/+70
| * | | | | Rename AthensDbMock -> AthenzDbMockBjørn Christian Seime2017-10-178-32/+32
| * | | | | Rename AthensDomain -> AthenzDomainBjørn Christian Seime2017-10-1723-107/+107
| |/ / / /
* | | | | Merge pull request #3789 from vespa-engine/hmusum/add-persisted-setting-for-i...Harald Musum2017-10-178-23/+129
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add persistent setting for ignoring confidence calulationsHarald Musum2017-10-178-23/+129
| |/ / /
* / / / 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
* | | | Fix typoBjørn Christian Seime2017-10-161-1/+1
* | | | Use correct Athenz domain identifierBjørn Christian Seime2017-10-162-8/+8
* | | | Make ZmsKeystoreImpl constructor publicBjørn Christian Seime2017-10-161-1/+3
|/ / /
* | | Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1642-120/+1838
* | | Revert "Open-source Athenz integration for controller-server"Bjørn Christian Seime2017-10-1642-1838/+120
* | | Merge pull request #3754 from vespa-engine/bratseth/dont-validate-on-readMartin Polden2017-10-161-1/+1
|\ \ \
| * | | Don't validate when reading stored applicationsJon Bratseth2017-10-161-1/+1
* | | | Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1642-120/+1838
* | | | Merge pull request #3743 from vespa-engine/smorgrav/synch_app_metricsTorbjørn Smørgrav2017-10-1611-41/+235
|\ \ \ \ | |/ / / |/| | |
| * | | Update controller test result file maintenance.json with the new maintainertoby2017-10-131-11/+14
| * | | Schedule deployment metrics to run every 10 minutestoby2017-10-131-0/+3
| * | | Simplify getting maintained deployments infotoby2017-10-131-7/+3
| * | | Add deployment metric maintainertoby2017-10-132-0/+84
| * | | Decouple deployment metrics from the metricservice - to avoid external calls ...toby2017-10-137-25/+133
* | | | Merge pull request #3746 from vespa-engine/mpolden/freeze-confidenceJon Bratseth2017-10-1514-161/+361
|\ \ \ \
| * | | | Freeze confidence for previous versionsMartin Polden2017-10-137-107/+110
| * | | | Persist version statusMartin Polden2017-10-139-55/+252
| |/ / /
* | | | Merge pull request #3729 from vespa-engine/smorgrav/cost_add_flavor_infoTorbjørn Smørgrav2017-10-1312-28/+180
|\ \ \ \ | |/ / / |/| | |
| * | | Use correct fieldnames in deserialization of flavor infotoby2017-10-132-3/+6
| * | | Spellingtoby2017-10-131-2/+2
| * | | Specify better waste and tco and redefine deployment utilizationtoby2017-10-129-13/+103
| * | | Add more flavor info and redefine cluster tco and wastetoby2017-10-127-13/+68
| * | | Add more javadoc for utilization classestoby2017-10-122-4/+8
* | | | Merge pull request #3735 from vespa-engine/bratseth/shorter-job-timeout-in-cdMartin Polden2017-10-121-1/+4
|\ \ \ \