aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert " Upgrade to zookeeper 3.4.14, take 4"Harald Musum2019-08-279-37/+40
* Merge pull request #10402 from vespa-engine/revert-10388-revert-10370-revert-...Harald Musum2019-08-279-40/+37
|\
| * Merge branch 'master' into revert-10388-revert-10370-revert-10346-revert-1033...Harald Musum2019-08-2750-1048/+647
| |\
| * | Remove annotationHarald Musum2019-08-271-4/+2
| * | Move commentHarald Musum2019-08-271-1/+1
| * | Revert "Exclusion needed to get a working config server"Harald Musum2019-08-271-9/+0
| * | Exclusion needed to get a working config serverHarald Musum2019-08-271-0/+9
| * | Merge branch 'master' into revert-10388-revert-10370-revert-10346-revert-1033...Harald Musum2019-08-2651-207/+379
| |\ \
| * | | Revert "Revert "Depend on zkfacade for tests""Harald Musum2019-08-261-0/+7
| * | | Revert "Depend on zkfacade for tests"Harald Musum2019-08-261-7/+0
| * | | Merge branch 'master' into revert-10388-revert-10370-revert-10346-revert-1033...Harald Musum2019-08-2645-370/+681
| |\ \ \
| * | | | Depend on zkfacade for testsHarald Musum2019-08-261-0/+7
| * | | | Depend on zkfacade for testsHarald Musum2019-08-261-0/+7
| * | | | Remove unused dependency on zkfacadeHarald Musum2019-08-261-5/+0
| * | | | Revert "Revert "Upgrade to zookeeper 3.4.14, take 3" MERGEOK"Harald Musum2019-08-265-31/+21
* | | | | Merge pull request #10427 from vespa-engine/revert-10420-revert-10411-mortent...Leandro Alves2019-08-274-10/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Revert "Use real port 4443 for NLBs""Andreas Eriksen2019-08-274-10/+9
* | | | | Merge pull request #10426 from vespa-engine/mortent/tls4443-fix-multinodeBjørn Christian Seime2019-08-273-7/+33
|\ \ \ \ \
| * | | | | Add connector config onceMorten Tokle2019-08-273-7/+33
* | | | | | Merge pull request #10424 from vespa-engine/geirst/rewrite-enum-store-diction...Geir Storli2019-08-2712-75/+187
|\ \ \ \ \ \
| * | | | | | Move count functions from enum store dictionary to unique store dictionary.Geir Storli2019-08-2710-51/+128
| * | | | | | Add read snapshot class for unique store dictionary.Geir Storli2019-08-275-24/+59
* | | | | | | Merge pull request #10425 from vespa-engine/toregge/update-compaction-count-f...Geir Storli2019-08-276-5/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Also update compaction count for old style compaction.Tor Egge2019-08-276-5/+11
|/ / / / / /
* | | | | | Merge pull request #10417 from vespa-engine/toregge/use-unique-store-enumerat...Geir Storli2019-08-2718-141/+175
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Test that flushed sync token is not updated when attribute flush fails.Tor Egge2019-08-261-0/+29
| * | | | | Use unique store enumerator when saving enumerated attribute vectors.Tor Egge2019-08-2617-141/+146
* | | | | | Merge pull request #10422 from vespa-engine/revert-10419-revert-10414-andreer...Andreas Eriksen2019-08-273-15/+19
|\ \ \ \ \ \
| * | | | | | disable cert when feature flag is off, even if already provisionedandreer2019-08-271-5/+6
| * | | | | | keep disabled by defaultAndreas Eriksen2019-08-271-1/+1
| * | | | | | Revert "Revert "provision certificates for directly routed zones""Andreas Eriksen2019-08-274-11/+14
* | | | | | | Merge pull request #10421 from vespa-engine/mpolden/remove-multiple-endpoints...Martin Polden2019-08-276-121/+57
|\ \ \ \ \ \ \
| * | | | | | | Remove multiple-global-endpoints feature flagMartin Polden2019-08-276-121/+57
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #10418 from vespa-engine/freva/add-bandwidthValerij Fredriksen2019-08-271-0/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add bandwidth and fastDisk to NodeRepository nodeValerij Fredriksen2019-08-261-0/+22
* | | | | | | Merge pull request #10416 from vespa-engine/freva/add-nodeValerij Fredriksen2019-08-2710-684/+100
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove canonicalFlavor from node-adminValerij Fredriksen2019-08-263-27/+1
| * | | | | | Update AddNode with resources and flavor overridesValerij Fredriksen2019-08-263-30/+39
| * | | | | | Use NodeResources & ApplicationId in NodeSpecValerij Fredriksen2019-08-265-161/+60
| * | | | | | Remove unused scriptsValerij Fredriksen2019-08-262-466/+0
| |/ / / / /
* | | | | | Merge pull request #10410 from vespa-engine/mpolden/preserve-commit-detailsJon Marius Venstad2019-08-273-11/+54
|\ \ \ \ \ \
| * | | | | | Preserve commit details of previous versionsMartin Polden2019-08-263-11/+54
* | | | | | | Merge pull request #10419 from vespa-engine/revert-10414-andreer/only-provisi...Andreas Eriksen2019-08-264-14/+11
|\ \ \ \ \ \ \
| * | | | | | | Revert "provision certificates for directly routed zones"Andreas Eriksen2019-08-264-14/+11
* | | | | | | | Merge pull request #10420 from vespa-engine/revert-10411-mortent/nlb-4443Andreas Eriksen2019-08-264-9/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Revert "Use real port 4443 for NLBs"Andreas Eriksen2019-08-264-9/+10
|/ / / / / / /
* | | | | | | Merge pull request #10411 from vespa-engine/mortent/nlb-4443Andreas Eriksen2019-08-264-10/+9
|\ \ \ \ \ \ \
| * | | | | | | Use real port 4443 for NLBsMorten Tokle2019-08-264-10/+9
* | | | | | | | Merge pull request #10414 from vespa-engine/andreer/only-provision-cert-for-d...Andreas Eriksen2019-08-264-11/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | provision certificates for directly routed zonesandreer2019-08-264-11/+14
| | |/ / / / / | |/| | | | |