Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Also reply in the thread pool. | Henning Baldersheim | 2017-09-27 | 2 | -1/+10 |
* | Do the sending in a thread pool too. | Henning Baldersheim | 2017-09-27 | 1 | -3/+5 |
* | Merge pull request #3539 from vespa-engine/mpolden/skip-upgrade-when-blocked | Martin Polden | 2017-09-27 | 10 | -82/+181 |
|\ | |||||
| * | Do not upgrade when blocked by deployment spec | Martin Polden | 2017-09-27 | 4 | -0/+59 |
| * | Refactor ControllerTester | Martin Polden | 2017-09-27 | 7 | -82/+122 |
* | | Merge pull request #3541 from vespa-engine/freva/lock-javadoc | Valerij Fredriksen | 2017-09-27 | 2 | -0/+27 |
|\ \ | |||||
| * | | Add javadoc | Valerij Fredriksen | 2017-09-26 | 2 | -0/+27 |
* | | | Merge pull request #3550 from vespa-engine/geirst/extend-hwinfo-config-in-proton | Tor Egge | 2017-09-27 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | Add hwinfo config on whether disk is shared or not. | Geir Storli | 2017-09-26 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #3520 from vespa-engine/hakon/move-supermodel-to-config-mo... | hakonhall | 2017-09-27 | 13 | -161/+244 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into hakon/move-supermodel-to-config-model-api | Håkon Hallingstad | 2017-09-26 | 9 | -108/+470 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into hakon/move-supermodel-to-co... | Håkon Hallingstad | 2017-09-26 | 49 | -338/+553 |
| |\ \ \ \ | |||||
| * | | | | | Move SuperModel to config-model-api | Håkon Hallingstad | 2017-09-25 | 13 | -161/+244 |
* | | | | | | Merge pull request #3542 from vespa-engine/balder/use-multiple-threads-for-mb... | Henning Baldersheim | 2017-09-27 | 35 | -119/+121 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add test for makeLambdaTask | Henning Baldersheim | 2017-09-26 | 2 | -23/+12 |
| * | | | | | Assert that task is accepted. | Henning Baldersheim | 2017-09-26 | 1 | -1/+2 |
| * | | | | | Need to wait until first message has arrived since there are no ordering guar... | Henning Baldersheim | 2017-09-26 | 1 | -0/+1 |
| * | | | | | Ensure we get to drain everything. | Henning Baldersheim | 2017-09-26 | 1 | -1/+2 |
| * | | | | | Use threadpool also for RequestDone | Henning Baldersheim | 2017-09-26 | 2 | -0/+6 |
| * | | | | | Start with 4 threads. Also mention all captures instead of & | Henning Baldersheim | 2017-09-26 | 2 | -2/+2 |
| * | | | | | Use multiple threads for mbus invoke | Henning Baldersheim | 2017-09-26 | 33 | -96/+100 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3540 from vespa-engine/mpolden/handle-missing-project-id | Martin Polden | 2017-09-27 | 4 | -6/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Ignore applications missing project ID in build system | Martin Polden | 2017-09-26 | 4 | -6/+61 |
* | | | | | | Merge pull request #3514 from vespa-engine/hmusum/fail-nodes-with-count-large... | Harald Musum | 2017-09-27 | 2 | -3/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Let fail count indicate hw failure in cd too | Harald Musum | 2017-09-25 | 2 | -3/+1 |
* | | | | | | | Merge pull request #3547 from vespa-engine/balder/retract-carte-blanche-to-kill | Harald Musum | 2017-09-27 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Temoporary permission to kill the bad guys have been revoken. | Henning Baldersheim | 2017-09-27 | 2 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3536 from vespa-engine/freva/use-string-as-lock-key | Valerij Fredriksen | 2017-09-26 | 1 | -5/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Use String as lock key | Valerij Fredriksen | 2017-09-26 | 1 | -5/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3535 from vespa-engine/johans1-mentionstackoverflow | Kristian Aune | 2017-09-26 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Update CONTRIBUTING.md | Kim Omar Johansen | 2017-09-26 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3533 from vespa-engine/gjoranv/dont-enforce-deps-on-old-m... | Bjørn Christian Seime | 2017-09-26 | 1 | -98/+103 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Do not enforce container deps on maven 3.0.5 | gjoranv | 2017-09-25 | 1 | -98/+103 |
* | | | | | Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgrade | Martin Polden | 2017-09-26 | 6 | -8/+360 |
|\ \ \ \ \ | |||||
| * | | | | | Update schema | Martin Polden | 2017-09-25 | 2 | -0/+9 |
| * | | | | | Read block-upgrade tag from deployment spec | Martin Polden | 2017-09-25 | 4 | -8/+351 |
* | | | | | | Merge pull request #3534 from vespa-engine/hmusum/check-for-new-or-removed-se... | Harald Musum | 2017-09-26 | 1 | -2/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Check for sessions changed after reconnecting | Harald Musum | 2017-09-26 | 1 | -2/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #3531 from vespa-engine/gjoranv/typo | Jon Bratseth | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | No 'of' needed. | gjoranv | 2017-09-25 | 1 | -1/+1 |
| * | | | | | might -> may | gjoranv | 2017-09-25 | 1 | -1/+1 |
| * | | | | | Fix typo. | gjoranv | 2017-09-25 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3532 from vespa-engine/toregge/eliminate-inlining-warnings | Henning Baldersheim | 2017-09-25 | 1 | -43/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Eliminate inlining warnings. | Tor Egge | 2017-09-25 | 1 | -43/+1 |
* | | | | | | Merge pull request #3527 from vespa-engine/havardpe/use-internal-match-data-f... | Henning Baldersheim | 2017-09-25 | 9 | -32/+77 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use internal match data for common dummy term field match data | Håvard Pettersen | 2017-09-25 | 9 | -32/+77 |
* | | | | | | | Merge pull request #3515 from vespa-engine/freva/node-admin-lock | Valerij Fredriksen | 2017-09-25 | 14 | -144/+185 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Noop change to retrigger travis | Valerij Fredriksen | 2017-09-25 | 1 | -1/+1 |
| * | | | | | | | Move if | Valerij Fredriksen | 2017-09-25 | 1 | -3/+3 |
| * | | | | | | | Use own monitor | Valerij Fredriksen | 2017-09-25 | 2 | -21/+31 |