Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't cache ZMS client instance | Bjørn Christian Seime | 2017-10-24 | 1 | -4/+3 |
| | | | | | Caching the client will eventually result in the client having an expired principal token. All requests to ZMS will then fail. | ||||
* | Merge pull request #3848 from vespa-engine/bjorncs/athenz | Bjørn Christian Seime | 2017-10-23 | 8 | -21/+21 |
|\ | | | | | Revert "Rename TenantType.Athens -> TenantType.Athenz" | ||||
| * | Revert "Rename TenantType.Athens -> TenantType.Athenz" | Bjørn Christian Seime | 2017-10-23 | 8 | -21/+21 |
| | | | | | | | | This reverts commit ce1da3698d732b9f8bc5033695512c049dd8b80b. | ||||
* | | Merge pull request #3841 from vespa-engine/bratseth/handle-missing-jobstatus | Martin Polden | 2017-10-23 | 1 | -0/+1 |
|\ \ | | | | | | | Handle missing job status | ||||
| * | | Handle missing job status | Jon Bratseth | 2017-10-23 | 1 | -0/+1 |
| |/ | |||||
* / | Print message, avoid stack trace in log | Harald Musum | 2017-10-23 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #3825 from vespa-engine/bratseth/dont-parallel-trigger | Martin Polden | 2017-10-20 | 6 | -32/+196 |
|\ | | | | | Disallow parallel triggering | ||||
| * | Disallow parallel triggering | Jon Bratseth | 2017-10-19 | 6 | -32/+196 |
| | | | | | | | | | | | | | | - Disallow parallel triggering - Let triggerReadyJobs look at all jobs - Refuse to trigger an upgrade if a newer upgrade has started in the meantime (due to block + timeout) - More upgrade+block scenario tests | ||||
* | | Rename TenantType.Athens -> TenantType.Athenz | Bjørn Christian Seime | 2017-10-19 | 8 | -21/+21 |
| | | |||||
* | | Fix provision id lock | Valerij Fredriksen | 2017-10-19 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #3796 from ↵ | Jon Marius Venstad | 2017-10-18 | 1 | -10/+13 |
|\ \ | | | | | | | | | | | | | vespa-engine/jvenstad/catch-metrics-fetching-errors-and-reduce-locking Cleaner code | ||||
| * | | 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 ↵ | Jon Bratseth | 2017-10-18 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/bratseth/dont-remove-recall-neutral-terms Bratseth/dont remove recall neutral terms | ||||
| * | | | 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 | ||||
| | * | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | Bjorncs/athenz | ||||
| * | | | Rename 'athens' -> 'athenz' | Bjørn Christian Seime | 2017-10-17 | 8 | -70/+70 |
| | | | | | | | | | | | | | | | | Rename private varibles/fields and test symbols from 'athens' to 'athenz' | ||||
| * | | | 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 ↵ | Harald Musum | 2017-10-17 | 8 | -23/+129 |
|\ \ \ | |_|/ |/| | | | | | | | | vespa-engine/hmusum/add-persisted-setting-for-ignoring-confidence-calculations Add persistent setting for ignoring confidence calculations | ||||
| * | | 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 |
| | | | | | | * Serverpool in ZK * Change timeouts | ||||
* | Merge pull request #3772 from vespa-engine/bjorncs/athenz-migration | Jon Bratseth | 2017-10-17 | 1 | -1/+1 |
|\ | | | | | Method should be PUT, not POST | ||||
| * | 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 |
| | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c. | ||||
* | Merge pull request #3754 from vespa-engine/bratseth/dont-validate-on-read | Martin Polden | 2017-10-16 | 1 | -1/+1 |
|\ | | | | | Bratseth/dont validate on read | ||||
| * | 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 |
|\ \ | |/ |/| | Decouple deployment metrics from the metricservice | ||||
| * | 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 |
| | |