summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Aressem/remove post install script""Arnstein Ressem2017-09-2772-309/+349
* Merge pull request #3553 from vespa-engine/mpolden/allow-deploy-without-projectMartin Polden2017-09-277-92/+112
|\
| * Use DeploymentTester in tests that deployMartin Polden2017-09-272-23/+52
| * Allow direct deploy for applications without a projectMartin Polden2017-09-275-69/+60
* | Merge pull request #3561 from vespa-engine/revert-3554-aressem/remove-post-in...Arnstein Ressem2017-09-2772-349/+309
|\ \
| * | Revert "Aressem/remove post install script"Arnstein Ressem2017-09-2772-349/+309
|/ /
* | Merge pull request #3559 from vespa-engine/aressem/ignore-generated-fileArnstein Ressem2017-09-271-0/+1
|\ \
| * | Ignore generated default-env.txtArnstein Ressem2017-09-271-0/+1
|/ /
* | Merge pull request #3556 from vespa-engine/hmusum/fix-messageValerij Fredriksen2017-09-271-1/+1
|\ \
| * | Remove superfluous characters in exception messageHarald Musum2017-09-271-1/+1
* | | Merge pull request #3554 from vespa-engine/aressem/remove-post-install-scriptArnstein Ressem2017-09-2772-309/+349
|\ \ \ | |_|/ |/| |
| * | Delete post install script.Arnstein Ressem2017-09-271-53/+0
| * | Create function to install config definitions.Arnstein Ressem2017-09-2733-210/+142
| * | Use relative path in install.Arnstein Ressem2017-09-271-1/+1
| * | Create zookeeper dir.Arnstein Ressem2017-09-261-0/+1
| * | Fix directories.Arnstein Ressem2017-09-266-6/+12
| * | Get rid of config file in post install.Arnstein Ressem2017-09-263-22/+6
| * | Some files left out compared to old version.Arnstein Ressem2017-09-262-0/+2
| * | Remove dirname.Arnstein Ressem2017-09-261-1/+1
| * | Typos in subdirs.Arnstein Ressem2017-09-261-2/+2
| * | Remove global install of files and put this in the modules that owns them.Arnstein Ressem2017-09-2550-162/+330
* | | Merge pull request #3551 from vespa-engine/balder/also-send-in-thread-pool-2Henning Baldersheim2017-09-273-5/+11
|\ \ \
| * | | Disable multiple threads until we have figured out ordering requirements from...Henning Baldersheim2017-09-272-13/+5
| * | | Assert that we are not rejected. If we are there are a logic flaw somewhere....Henning Baldersheim2017-09-272-4/+6
| * | | Move the redundant sync from shutdown to where it is required in sync.Henning Baldersheim2017-09-271-1/+1
| * | | Assert that task is accepted.Henning Baldersheim2017-09-271-1/+2
| * | | 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 #3543 from vespa-engine/balder/java-mbus-handle-incoming-d...Henning Baldersheim2017-09-272-3/+15
|\ \ \ \
| * | | | Use the threadpool for handling incomming requests and replies.Henning Baldersheim2017-09-262-3/+15
| | |_|/ | |/| |
* | | | Merge pull request #3552 from vespa-engine/hmusum/initialize-variablesHenning Baldersheim2017-09-271-2/+2
|\ \ \ \
| * | | | Make sure to initialize variablesHarald Musum2017-09-271-2/+2
| |/ / /
* | | | Merge pull request #3546 from vespa-engine/freva/limit-to-processing-one-core...Valerij Fredriksen2017-09-273-21/+58
|\ \ \ \ | |_|/ / |/| | |
| * | | Increase coredump handle frequencyValerij Fredriksen2017-09-271-1/+1
| * | | Rename methods, no functional changesValerij Fredriksen2017-09-272-15/+15
| * | | Limit to one coredump processingValerij Fredriksen2017-09-272-8/+45
| |/ /
* | | 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