Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | As requested. | Jon Marius Venstad | 2017-10-18 | 1 | -2/+2 | |
| * | | | | Cleaner code | Jon Marius Venstad | 2017-10-17 | 1 | -10/+13 | |
* | | | | | Merge pull request #3788 from vespa-engine/bratseth/dont-remove-recall-neutra... | Jon Bratseth | 2017-10-18 | 2 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Nonfunctional changes only | Jon Bratseth | 2017-10-18 | 1 | -1/+1 | |
| * | | | | | Merge with master | Jon Bratseth | 2017-10-17 | 9 | -36/+156 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Don't remove OR terms which contributes to rank | Jon Bratseth | 2017-10-17 | 2 | -8/+11 | |
| * | | | | | | Remove temporary line | Jon Bratseth | 2017-10-17 | 1 | -1/+0 | |
| * | | | | | | Nonfunctional changes only | Jon Bratseth | 2017-10-17 | 1 | -0/+1 | |
* | | | | | | | Merge branch 'master' into smorgrav/cost_npe | toby | 2017-10-18 | 8 | -39/+45 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge pull request #3812 from vespa-engine/bratseth/catch-missing-zone | Torbjørn Smørgrav | 2017-10-18 | 1 | -5/+9 | |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| | * | | | | | | Catch more errors and warn | Jon Bratseth | 2017-10-18 | 1 | -5/+9 | |
| * | | | | | | | Warn when using deprecated authorization validation | Bjørn Christian Seime | 2017-10-18 | 2 | -1/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | Rename Athens->Athenz | Bjørn Christian Seime | 2017-10-18 | 7 | -33/+33 | |
* | | | | | | | Avoid NPE when cluster utilizations are updated but not cluster info | toby | 2017-10-18 | 2 | -2/+12 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3801 from vespa-engine/bjorncs/athenz-migration | gjoranv | 2017-10-18 | 1 | -5/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Only create Athenz resource group once for each appliation name | Bjørn Christian Seime | 2017-10-18 | 1 | -5/+9 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3787 from vespa-engine/bjorncs/athenz | Morten Tokle | 2017-10-18 | 24 | -189/+189 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Rename 'athens' -> 'athenz' | Bjørn Christian Seime | 2017-10-17 | 8 | -70/+70 | |
| * | | | | | Rename AthensDbMock -> AthenzDbMock | Bjørn Christian Seime | 2017-10-17 | 8 | -32/+32 | |
| * | | | | | Rename AthensDomain -> AthenzDomain | Bjørn Christian Seime | 2017-10-17 | 23 | -107/+107 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3789 from vespa-engine/hmusum/add-persisted-setting-for-i... | Harald Musum | 2017-10-17 | 8 | -23/+129 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Add persistent setting for ignoring confidence calulations | Harald Musum | 2017-10-17 | 8 | -23/+129 | |
| |/ / / | ||||||
* / / / | Ignore timeouts (retried later anyway) and reduce locking time | Jon Marius Venstad | 2017-10-17 | 1 | -8/+25 | |
|/ / / | ||||||
* | | | Serverpool in ZK (#3764) | Valerij Fredriksen | 2017-10-17 | 1 | -3/+35 | |
* | | | Merge pull request #3772 from vespa-engine/bjorncs/athenz-migration | Jon Bratseth | 2017-10-17 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Method should be PUT, not POST | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 | |
* | | | | Fix typo | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 | |
* | | | | Use correct Athenz domain identifier | Bjørn Christian Seime | 2017-10-16 | 2 | -8/+8 | |
* | | | | Make ZmsKeystoreImpl constructor public | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 42 | -120/+1838 | |
* | | | Revert "Open-source Athenz integration for controller-server" | Bjørn Christian Seime | 2017-10-16 | 42 | -1838/+120 | |
* | | | Merge pull request #3754 from vespa-engine/bratseth/dont-validate-on-read | Martin Polden | 2017-10-16 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Don't validate when reading stored applications | Jon Bratseth | 2017-10-16 | 1 | -1/+1 | |
* | | | | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 42 | -120/+1838 | |
* | | | | Merge pull request #3743 from vespa-engine/smorgrav/synch_app_metrics | Torbjørn Smørgrav | 2017-10-16 | 11 | -41/+235 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Update controller test result file maintenance.json with the new maintainer | toby | 2017-10-13 | 1 | -11/+14 | |
| * | | | Schedule deployment metrics to run every 10 minutes | toby | 2017-10-13 | 1 | -0/+3 | |
| * | | | Simplify getting maintained deployments info | toby | 2017-10-13 | 1 | -7/+3 | |
| * | | | Add deployment metric maintainer | toby | 2017-10-13 | 2 | -0/+84 | |
| * | | | Decouple deployment metrics from the metricservice - to avoid external calls ... | toby | 2017-10-13 | 7 | -25/+133 | |
* | | | | Merge pull request #3746 from vespa-engine/mpolden/freeze-confidence | Jon Bratseth | 2017-10-15 | 14 | -161/+361 | |
|\ \ \ \ | ||||||
| * | | | | Freeze confidence for previous versions | Martin Polden | 2017-10-13 | 7 | -107/+110 | |
| * | | | | Persist version status | Martin Polden | 2017-10-13 | 9 | -55/+252 | |
| |/ / / | ||||||
* | | | | Merge pull request #3729 from vespa-engine/smorgrav/cost_add_flavor_info | Torbjørn Smørgrav | 2017-10-13 | 12 | -28/+180 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Use correct fieldnames in deserialization of flavor info | toby | 2017-10-13 | 2 | -3/+6 | |
| * | | | Spelling | toby | 2017-10-13 | 1 | -2/+2 | |
| * | | | Specify better waste and tco and redefine deployment utilization | toby | 2017-10-12 | 9 | -13/+103 | |
| * | | | Add more flavor info and redefine cluster tco and waste | toby | 2017-10-12 | 7 | -13/+68 | |
| * | | | Add more javadoc for utilization classes | toby | 2017-10-12 | 2 | -4/+8 | |
* | | | | Merge pull request #3735 from vespa-engine/bratseth/shorter-job-timeout-in-cd | Martin Polden | 2017-10-12 | 1 | -1/+4 | |
|\ \ \ \ |