summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.99.22-1].vespa-7.99.22-1sd-buildbot2019-08-294-1/+2
* Merge pull request #10438 from vespa-engine/aressem/use-dummy-date-and-commit...Arnstein Ressem2019-08-282-3/+3
|\
| * Set dummy commit ref and date 0 when git is not available in tree.Arnstein Ressem2019-08-282-3/+3
|/
* Merge pull request #10433 from vespa-engine/geirst/refactor-enum-store-dictio...Geir Storli2019-08-2725-573/+611
|\
| * Remove explicit template instantiation that is already in enumstorebase.cpp.Geir Storli2019-08-271-2/+0
| * Rename UniqueStoreDictionaryBase -> IUniqueStoreDictionary.Geir Storli2019-08-2710-23/+23
| * Rename enum store dictionary api and implementation and move to separate files.Geir Storli2019-08-2716-551/+591
* | Merge pull request #10434 from vespa-engine/revert-10427-revert-10420-revert-...Valerij Fredriksen2019-08-274-9/+10
|\ \ | |/ |/|
| * Revert "Revert "Revert "Use real port 4443 for NLBs"""Andreas Eriksen2019-08-274-9/+10
|/
* Merge pull request #10432 from vespa-engine/toregge/convert-enum-value-in-enu...Geir Storli2019-08-2710-87/+31
|\
| * Convert enum value in enum store to a dummy value, in preparationTor Egge2019-08-2710-87/+31
* | Merge pull request #10431 from vespa-engine/balder/properly-initialize-soft-d...Yngve Aasheim2019-08-275-9/+3
|\ \
| * | Just keep soft_doom_factor metrics.Henning Baldersheim2019-08-271-4/+0
| * | Initialize softdoom factor to correct proper initial value to avoid noise in ...Henning Baldersheim2019-08-274-5/+3
| |/
* | Merge pull request #10428 from vespa-engine/revert-10402-revert-10388-revert-...Harald Musum2019-08-279-37/+40
|\ \ | |/ |/|
| * Revert " Upgrade to zookeeper 3.4.14, take 4"Harald Musum2019-08-279-37/+40
* | Merge pull request #10429 from vespa-engine/mpolden/pass-only-container-endpo...Øyvind Grønnesby2019-08-272-11/+10
|\ \ | |/ |/|
| * Only pass container endpoints in deployMartin Polden2019-08-272-11/+10
* | 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
| | |_|/ / / / | |/| | | | |