aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nonfunctional changes onlyJon Bratseth2018-01-1516-68/+85
* Merge pull request #4653 from vespa-engine/hmusum/prefer-zookeeper-on-localho...Harald Musum2018-01-151-1/+1
|\
| * Prefer zookeeper server on localhost for CDHarald Musum2018-01-141-1/+1
* | Merge pull request #4656 from vespa-engine/arnej/fix-cmdline-tools-3Harald Musum2018-01-152-1/+2
|\ \
| * | skip script intalled in vespaclient-javaArne Juul2018-01-151-1/+0
| * | install jing.jarArne Juul2018-01-151-0/+2
* | | Merge pull request #4651 from vespa-engine/hakonhall/detect-bad-component-ref...Håkon Hallingstad2018-01-151-1/+7
|\ \ \
| * | | Detect bad component referenceHåkon Hallingstad2018-01-121-1/+7
* | | | Merge pull request #4650 from vespa-engine/hakonhall/fix-services-xml-elementHåkon Hallingstad2018-01-151-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix services.xml elementHåkon Hallingstad2018-01-121-2/+2
* | | | Merge pull request #4654 from vespa-engine/musum/log-when-creating-tenantsHenning Baldersheim2018-01-141-5/+6
|\ \ \ \
| * | | | Log when before and after creating tenantsHarald Musum2018-01-141-5/+6
| | |_|/ | |/| |
* | | | Merge pull request #4655 from vespa-engine/revert-4638-revert-4635-revert-460...Henning Baldersheim2018-01-1423-1186/+629
|\ \ \ \
| * | | | Revert "Revert "Revert "Balder/group multiple commits rebased 1"""Henning Baldersheim2018-01-1423-1186/+629
|/ / / /
* | | | Merge pull request #4638 from vespa-engine/revert-4635-revert-4601-balder/gro...Henning Baldersheim2018-01-1423-629/+1186
|\ \ \ \
| * | | | Revert accidental commit.Henning Baldersheim2018-01-121-0/+1
| * | | | Unify implementation definition.Henning Baldersheim2018-01-121-11/+22
| * | | | Ensure that we do not drop it on the floor.Henning Baldersheim2018-01-123-7/+11
| * | | | 10ms, should not be 1ms.Henning Baldersheim2018-01-121-18/+35
| * | | | 10ms, should not be 1ms.Henning Baldersheim2018-01-121-1/+1
| * | | | 10ms, should not be 1ms.Henning Baldersheim2018-01-121-1/+1
| * | | | Extend test to cover async commit too.Henning Baldersheim2018-01-121-188/+225
| * | | | Revert "Revert "Balder/group multiple commits rebased 1""Henning Baldersheim2018-01-1223-424/+911
* | | | | Merge pull request #4652 from vespa-engine/revert-4625-arnej/fix-cmdline-toolsArne H Juul2018-01-143-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Arnej/fix cmdline tools"Harald Musum2018-01-143-3/+2
|/ / / /
* | | | Merge pull request #4625 from vespa-engine/arnej/fix-cmdline-toolsArne H Juul2018-01-133-2/+3
|\ \ \ \
| * | | | skip script intalled in vespaclient-javaArne Juul2018-01-111-1/+0
| * | | | install jing.jarArne Juul2018-01-111-0/+2
| * | | | use generic use "vespa"Arne Juul2018-01-111-1/+1
* | | | | Merge pull request #4633 from vespa-engine/hakonhall/some-curator-clients-req...Harald Musum2018-01-1313-90/+131
|\ \ \ \ \
| * | | | | Revert "Detect bad component reference"Håkon Hallingstad2018-01-121-7/+1
| * | | | | Detect bad component referenceHåkon Hallingstad2018-01-121-1/+7
| * | | | | Build proper connect string instead of just hostnameHåkon Hallingstad2018-01-123-1/+36
| * | | | | Some Curator clients require ensemble connect stringHåkon Hallingstad2018-01-1114-101/+107
* | | | | | Merge pull request #4649 from vespa-engine/hmusum/do-not-try-to-acces-return-...Harald Musum2018-01-131-17/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Do not try to access RPC return values when we get an errorHarald Musum2018-01-121-17/+18
|/ / / / /
* | | | | Merge pull request #4648 from vespa-engine/mpolden/remove-root-handler-from-testMartin Polden2018-01-121-3/+0
|\ \ \ \ \
| * | | | | Remove root handler from test containerMartin Polden2018-01-121-3/+0
|/ / / / /
* | | | | Merge pull request #4647 from vespa-engine/mpolden/remove-controller-root-han...Jon Bratseth2018-01-123-152/+0
|\ \ \ \ \
| * | | | | Remove outdated controller root handlerMartin Polden2018-01-123-152/+0
* | | | | | Merge pull request #4645 from vespa-engine/revert-4616-bjorncs/use-open-sourc...Bjørn Christian Seime2018-01-121-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Migrate to open-source zpu"Bjørn Christian Seime2018-01-121-1/+1
|/ / / / /
* | | | | Merge pull request #4637 from vespa-engine/freva/zone-v2-copy-method-override...Bjørn Christian Seime2018-01-121-5/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | ZoneV2 copy method override headerValerij Fredriksen2018-01-121-5/+6
* | | | | Merge pull request #4636 from vespa-engine/mpolden/test-delete-with-active-de...Jon Bratseth2018-01-122-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Test delete application with active deploymentsMartin Polden2018-01-122-0/+9
| | |/ / | |/| |
* | | | Merge pull request #4635 from vespa-engine/revert-4601-balder/group-multiple-...Henning Baldersheim2018-01-1223-911/+424
|\ \ \ \
| * | | | Revert "Balder/group multiple commits rebased 1"Arnstein Ressem2018-01-1223-911/+424
|/ / / /
* | | | Merge pull request #4634 from vespa-engine/hakonhall/shut-down-http-client-re...Håkon Hallingstad2018-01-121-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Shut down HTTP client refresh executor service on deconstructHåkon Hallingstad2018-01-111-0/+1
|/ / /