Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check for sessions changed after reconnecting | Harald Musum | 2017-09-26 | 1 | -2/+4 |
| | |||||
* | Remove unnecessary sleep | Harald Musum | 2017-09-21 | 1 | -2/+0 |
| | |||||
* | Add proper test of prugin of old inactive sessions | Harald Musum | 2017-09-21 | 16 | -110/+183 |
| | | | | | | * Add support for injecting a clock to make it possible to test time-related scenarios * Add test | ||||
* | Merge pull request #3473 from vespa-engine/hmusum/non-functional-changes | Harald Musum | 2017-09-21 | 8 | -78/+72 |
|\ | | | | | Document and rename to make code easier to understand | ||||
| * | Add missing slash | Harald Musum | 2017-09-21 | 1 | -1/+1 |
| | | |||||
| * | Document and rename to make code easier to understand | Harald Musum | 2017-09-20 | 8 | -78/+72 |
| | | |||||
* | | Merge pull request #3466 from ↵ | hakonhall | 2017-09-20 | 6 | -69/+39 |
|\ \ | |/ |/| | | | | | vespa-engine/hakon/move-supermodel-api-to-config-model-api Move SuperModel API to config-model-api | ||||
| * | Move SuperModel API to config-model-api | Håkon Hallingstad | 2017-09-20 | 6 | -69/+39 |
| | | |||||
* | | Clarify test intent | Harald Musum | 2017-09-20 | 1 | -0/+5 |
|/ | |||||
* | Remove unused directory used only in previous versions | Harald Musum | 2017-09-18 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' into hmusum/only-create-hosted-vespa-tenant-on-hosted | Harald Musum | 2017-09-17 | 43 | -148/+273 |
|\ | |||||
| * | Merge pull request #3382 from vespa-engine/bratseth/support-error-removal | Arne H Juul | 2017-09-13 | 6 | -13/+11 |
| |\ | | | | | | | Bratseth/support error removal | ||||
| | * | Nonfunctional changes only | Jon Bratseth | 2017-09-11 | 6 | -13/+11 |
| | | | |||||
| * | | Merge pull request #3389 from ↵ | hakonhall | 2017-09-12 | 15 | -98/+209 |
| |\ \ | | |/ | |/| | | | | | | | vespa-engine/hakon/add-component-managing-the-supermodel Add component managing the SuperModel | ||||
| | * | Add component managing the SuperModel | Håkon Hallingstad | 2017-09-11 | 15 | -98/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the prerequisite step for having the Orchestrator depend on the SuperModel component, getting notified via SuperModelListener about newly activated or removed applications. The Orchestrator will then register for Slobrok as necessary, and also update its data structures of the model. | ||||
| * | | Throw exception when not getting activate lock within timeout | Harald Musum | 2017-09-11 | 1 | -1/+1 |
| |/ | |||||
| * | Fix deployment spec cast in container cluster model | Martin Polden | 2017-09-08 | 2 | -2/+2 |
| | | |||||
| * | Avoid creating strings unless necessary | Harald Musum | 2017-09-07 | 1 | -2/+2 |
| | | |||||
| * | Add request to log line | Harald Musum | 2017-09-07 | 1 | -2/+2 |
| | | |||||
| * | Add debug log line for config generation for supermodel configs | Harald Musum | 2017-09-07 | 1 | -1/+4 |
| | | |||||
| * | Use a more specific error code | Harald Musum | 2017-09-07 | 2 | -3/+3 |
| | | |||||
| * | Merge pull request #3327 from ↵ | Harald Musum | 2017-09-06 | 5 | -15/+44 |
| |\ | | | | | | | | | | | | | vespa-engine/revert-3308-revert-2934-hmusum/use-409-response-code-for-failing-activation Revert "Revert "Return 409 if there is a conflict when activating"" | ||||
| | * | Revert "Revert "Return 409 if there is a conflict when activating"" | Harald Musum | 2017-09-05 | 5 | -15/+44 |
| | | | |||||
| * | | Merge pull request #3287 from ↵ | gjoranv | 2017-09-05 | 15 | -16/+0 |
| |\ \ | | |/ | |/| | | | | | | | vespa-engine/revert-3275-revert-3260-hmusum/remove-version-from-def-files Revert 3275 revert 3260 hmusum/remove version from def files | ||||
| | * | Merge branch 'master' into ↵ | Harald Musum | 2017-08-31 | 1 | -4/+2 |
| | |\ | | | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files | ||||
| | * | | Revert "Revert "version in def files are deprecated"" | Harald Musum | 2017-08-30 | 15 | -16/+0 |
| | | | | |||||
| * | | | Catch Throwable | Harald Musum | 2017-09-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Catch Error and log at a place where thread will otherwise die silently | Harald Musum | 2017-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Only create hosted-vespa tenant on hosted installations | Harald Musum | 2017-09-04 | 2 | -10/+11 |
|/ / / | |||||
* | | | Revert "Return 409 if there is a conflict when activating" | gjoranv | 2017-09-01 | 5 | -44/+15 |
| | | | |||||
* | | | Merge pull request #2934 from ↵ | Jon Bratseth | 2017-08-31 | 5 | -15/+44 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-409-response-code-for-failing-activation Return 409 if there is a conflict when activating | ||||
| * | | | Rename exception | Harald Musum | 2017-08-31 | 3 | -7/+7 |
| | | | | |||||
| * | | | Return 409 if there is a conflict when activating | Harald Musum | 2017-07-10 | 5 | -15/+44 |
| | | | | |||||
* | | | | Merge pull request #3251 from vespa-engine/bjorncs/reduce-mem-usage-configserver | Bjørn Christian Seime | 2017-08-31 | 1 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Reduce number of config server worker threads from default (500) | ||||
| * | | | Reduce number of worker threads from default (500) | Bjørn Christian Seime | 2017-08-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Reduce the number of worker threads will have a positive impact on the memory consumption. | ||||
* | | | | Nonfunctional changes | Jon Bratseth | 2017-08-30 | 1 | -4/+2 |
| |_|/ |/| | | |||||
* | | | Revert "version in def files are deprecated" | Harald Musum | 2017-08-30 | 15 | -0/+16 |
| | | | |||||
* | | | version in def files are deprecated | Harald Musum | 2017-08-30 | 15 | -16/+0 |
| | | | |||||
* | | | Remove warning | Jon Bratseth | 2017-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge with master | Jon Bratseth | 2017-08-28 | 2 | -4/+3 |
|\| | | |||||
| * | | Add application id to log | Harald Musum | 2017-08-24 | 3 | -6/+3 |
| | | | |||||
* | | | ProvisionInfo -> AllocatedHosts | Jon Bratseth | 2017-08-28 | 7 | -102/+103 |
| | | | |||||
* | | | Add one wimphy test | Jon Bratseth | 2017-08-28 | 9 | -29/+46 |
| | | | |||||
* | | | Allow model evolution which removes clusters | Jon Bratseth | 2017-08-28 | 6 | -28/+73 |
| | | | |||||
* | | | Explicitly pass the correct allocated hosts | Jon Bratseth | 2017-08-28 | 5 | -40/+27 |
| | | | |||||
* | | | Track API changes, remove warnings | Jon Bratseth | 2017-08-28 | 3 | -3/+3 |
| | | | |||||
* | | | ProvisionInfo -> AllocatedHosts | Jon Bratseth | 2017-08-28 | 21 | -104/+98 |
| | | | |||||
* | | | Allocation consistency between model versions | Jon Bratseth | 2017-08-28 | 17 | -73/+118 |
| | | | |||||
* | | | Allocation consistency between model versions | Jon Bratseth | 2017-08-28 | 16 | -92/+129 |
| | | | |||||
* | | | Nonfunctional changes only | Jon Bratseth | 2017-08-23 | 4 | -4/+0 |
|/ / |