aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Also reply in the thread pool.Henning Baldersheim2017-09-271-1/+1
* Also reply in the thread pool.Henning Baldersheim2017-09-272-1/+10
* Do the sending in a thread pool too.Henning Baldersheim2017-09-271-3/+5
* Merge pull request #3539 from vespa-engine/mpolden/skip-upgrade-when-blockedMartin Polden2017-09-2710-82/+181
|\
| * Do not upgrade when blocked by deployment specMartin Polden2017-09-274-0/+59
| * Refactor ControllerTesterMartin Polden2017-09-277-82/+122
* | Merge pull request #3541 from vespa-engine/freva/lock-javadocValerij Fredriksen2017-09-272-0/+27
|\ \
| * | Add javadocValerij Fredriksen2017-09-262-0/+27
* | | Merge pull request #3550 from vespa-engine/geirst/extend-hwinfo-config-in-protonTor Egge2017-09-271-0/+5
|\ \ \
| * | | Add hwinfo config on whether disk is shared or not.Geir Storli2017-09-261-0/+5
| |/ /
* | | Merge pull request #3520 from vespa-engine/hakon/move-supermodel-to-config-mo...hakonhall2017-09-2713-161/+244
|\ \ \
| * \ \ Merge branch 'master' into hakon/move-supermodel-to-config-model-apiHåkon Hallingstad2017-09-269-108/+470
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into hakon/move-supermodel-to-co...Håkon Hallingstad2017-09-2649-338/+553
| |\ \ \ \
| * | | | | Move SuperModel to config-model-apiHåkon Hallingstad2017-09-2513-161/+244
* | | | | | Merge pull request #3542 from vespa-engine/balder/use-multiple-threads-for-mb...Henning Baldersheim2017-09-2735-119/+121
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add test for makeLambdaTaskHenning Baldersheim2017-09-262-23/+12
| * | | | | Assert that task is accepted.Henning Baldersheim2017-09-261-1/+2
| * | | | | Need to wait until first message has arrived since there are no ordering guar...Henning Baldersheim2017-09-261-0/+1
| * | | | | Ensure we get to drain everything.Henning Baldersheim2017-09-261-1/+2
| * | | | | Use threadpool also for RequestDoneHenning Baldersheim2017-09-262-0/+6
| * | | | | Start with 4 threads. Also mention all captures instead of &Henning Baldersheim2017-09-262-2/+2
| * | | | | Use multiple threads for mbus invokeHenning Baldersheim2017-09-2633-96/+100
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3540 from vespa-engine/mpolden/handle-missing-project-idMartin Polden2017-09-274-6/+61
|\ \ \ \ \
| * | | | | Ignore applications missing project ID in build systemMartin Polden2017-09-264-6/+61
* | | | | | Merge pull request #3514 from vespa-engine/hmusum/fail-nodes-with-count-large...Harald Musum2017-09-272-3/+1
|\ \ \ \ \ \
| * | | | | | Let fail count indicate hw failure in cd tooHarald Musum2017-09-252-3/+1
* | | | | | | Merge pull request #3547 from vespa-engine/balder/retract-carte-blanche-to-killHarald Musum2017-09-272-4/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Temoporary permission to kill the bad guys have been revoken.Henning Baldersheim2017-09-272-4/+4
|/ / / / / /
* | | | | | Merge pull request #3536 from vespa-engine/freva/use-string-as-lock-keyValerij Fredriksen2017-09-261-5/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use String as lock keyValerij Fredriksen2017-09-261-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3535 from vespa-engine/johans1-mentionstackoverflowKristian Aune2017-09-261-0/+3
|\ \ \ \ \
| * | | | | Update CONTRIBUTING.mdKim Omar Johansen2017-09-261-0/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #3533 from vespa-engine/gjoranv/dont-enforce-deps-on-old-m...Bjørn Christian Seime2017-09-261-98/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not enforce container deps on maven 3.0.5gjoranv2017-09-251-98/+103
* | | | | Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgradeMartin Polden2017-09-266-8/+360
|\ \ \ \ \
| * | | | | Update schemaMartin Polden2017-09-252-0/+9
| * | | | | Read block-upgrade tag from deployment specMartin Polden2017-09-254-8/+351
* | | | | | Merge pull request #3534 from vespa-engine/hmusum/check-for-new-or-removed-se...Harald Musum2017-09-261-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Check for sessions changed after reconnectingHarald Musum2017-09-261-2/+4
|/ / / / /
* | | | | Merge pull request #3531 from vespa-engine/gjoranv/typoJon Bratseth2017-09-251-1/+1
|\ \ \ \ \
| * | | | | No 'of' needed.gjoranv2017-09-251-1/+1
| * | | | | might -> maygjoranv2017-09-251-1/+1
| * | | | | Fix typo.gjoranv2017-09-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #3532 from vespa-engine/toregge/eliminate-inlining-warningsHenning Baldersheim2017-09-251-43/+1
|\ \ \ \ \
| * | | | | Eliminate inlining warnings.Tor Egge2017-09-251-43/+1
* | | | | | Merge pull request #3527 from vespa-engine/havardpe/use-internal-match-data-f...Henning Baldersheim2017-09-259-32/+77
|\ \ \ \ \ \
| * | | | | | use internal match data for common dummy term field match dataHåvard Pettersen2017-09-259-32/+77
* | | | | | | Merge pull request #3515 from vespa-engine/freva/node-admin-lockValerij Fredriksen2017-09-2514-144/+185
|\ \ \ \ \ \ \
| * | | | | | | Noop change to retrigger travisValerij Fredriksen2017-09-251-1/+1
| * | | | | | | Move ifValerij Fredriksen2017-09-251-3/+3