summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10391 from vespa-engine/bjorncs/security-utilsØyvind Grønnesby2019-08-231-1/+2
|\
| * Use correct key factory for key typeBjørn Christian Seime2019-08-231-1/+2
|/
* Merge pull request #10388 from vespa-engine/revert-10370-revert-10346-revert-...Arnstein Ressem2019-08-235-21/+31
|\
| * Revert "Upgrade to zookeeper 3.4.14, take 3"Harald Musum2019-08-235-21/+31
|/
* Merge pull request #10382 from vespa-engine/freva/flavor-overrides-restValerij Fredriksen2019-08-238-12/+156
|\
| * Add alternative namesValerij Fredriksen2019-08-231-0/+4
| * Add testsValerij Fredriksen2019-08-221-0/+66
| * Allow patching node resourcesValerij Fredriksen2019-08-221-0/+13
| * Allow adding new nodes with resourcesValerij Fredriksen2019-08-221-1/+39
| * Add methods to easily modify FlavorValerij Fredriksen2019-08-225-11/+34
* | Merge pull request #10384 from vespa-engine/geirst/rewrite-enum-store-dictionaryGeir Storli2019-08-238-231/+188
|\ \
| * | Rename template argument.Geir Storli2019-08-232-37/+34
| * | Rewrite enum store dictionary to inherit unique store dictionary.Geir Storli2019-08-226-196/+130
| * | Change unique store dictionary to take btree dictionary type as template argu...Geir Storli2019-08-224-31/+57
* | | Merge pull request #10370 from vespa-engine/revert-10346-revert-10336-hmusum/...Harald Musum2019-08-235-31/+21
|\ \ \
| * | | Exclusion is not needed anymoreHarald Musum2019-08-221-9/+0
| * | | Merge branch 'master' into revert-10346-revert-10336-hmusum/upgrade-to-zookee...Harald Musum2019-08-2286-971/+715
| |\ \ \
| * | | | IndentationHarald Musum2019-08-221-3/+2
| * | | | Remove NonNull annotationsHarald Musum2019-08-223-26/+13
| * | | | Exclude com.github.spotbugs:spotbugs-annotationsHarald Musum2019-08-211-0/+13
| * | | | Revert "Revert "Upgrade to ZooKeeper 3.4.14""Harald Musum2019-08-211-2/+2
* | | | | Merge pull request #10377 from vespa-engine/hakonhall/add-localmavenbin-to-pa...Jon Marius Venstad2019-08-231-0/+2
|\ \ \ \ \
| * | | | | Add local/maven/bin to PATH for Vespa applications, if it existsHåkon Hallingstad2019-08-221-0/+2
* | | | | | Merge pull request #10378 from vespa-engine/jvenstad/more-mojosJon Marius Venstad2019-08-2312-29/+197
|\ \ \ \ \ \
| * | | | | | Add effective services mojoJon Marius Venstad2019-08-228-2/+164
| * | | | | | Factor out abstract mojo on deployment levelJon Marius Venstad2019-08-224-27/+33
| |/ / / / /
* | | | | | Merge pull request #10383 from vespa-engine/bjorncs/config-thread-nameHenning Baldersheim2019-08-221-23/+11
|\ \ \ \ \ \
| * | | | | | Remove unused fieldBjørn Christian Seime2019-08-221-9/+0
| * | | | | | Assign name to config threadBjørn Christian Seime2019-08-221-16/+13
* | | | | | | Merge pull request #10387 from vespa-engine/olaa/storedinteger-last-modified-...Ola Aunrønning2019-08-221-11/+25
|\ \ \ \ \ \ \
| * | | | | | | Add last modified time to StoredIntegerOla Aunrønning2019-08-221-11/+25
* | | | | | | | Merge pull request #10385 from vespa-engine/balder/really-make-groupingSessio...Bjørn Christian Seime2019-08-226-14/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable grouping session cache default.Henning Baldersheim2019-08-226-14/+19
|/ / / / / / / /
* | | | | | | | Merge pull request #10379 from vespa-engine/vekterli/remove-unused-classBjørn Christian Seime2019-08-221-35/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused class. Config now received via injectionTor Brede Vekterli2019-08-221-35/+0
* | | | | | | | | Merge pull request #10380 from vespa-engine/bjorncs/fix-config-resource-leakBjørn Christian Seime2019-08-223-13/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Close config subscriber after getting configBjørn Christian Seime2019-08-223-13/+10
* | | | | | | | | Merge pull request #10381 from vespa-engine/balder/deprecate-getId-with-versionHenning Baldersheim2019-08-225-10/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Deprecate getId(version) and remove usage.Henning Baldersheim2019-08-225-10/+11
|/ / / / / / / /
* | | | | | | | Merge pull request #10375 from vespa-engine/balder/soft_doom_factor-metricHenning Baldersheim2019-08-223-14/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose backend metrics for soft_doom_factor.Henning Baldersheim2019-08-221-0/+8
| * | | | | | | | Add soft_doom_factor metric production per rankprofile in the backend.Henning Baldersheim2019-08-222-14/+17
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #10362 from vespa-engine/balder/remove-v6-and-v7-rebased-1Henning Baldersheim2019-08-2256-2567/+209
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Preserve constness.Henning Baldersheim2019-08-221-2/+2
| * | | | | | | Remove 42 serialize codeHenning Baldersheim2019-08-212-10/+0
| * | | | | | | Do not generate old formats, not even in tests.Henning Baldersheim2019-08-217-160/+98
| * | | | | | | Remove v6/v7 on c++ side tooHenning Baldersheim2019-08-219-162/+26
| * | | | | | | Update to require atleast vespa 6 version.Henning Baldersheim2019-08-218-780/+31
| * | | | | | | Remove v6 and v7 from java side.Henning Baldersheim2019-08-2136-1457/+56
* | | | | | | | Merge pull request #10374 from vespa-engine/hakonhall/etcprofiled-scripts-are...Arnstein Ressem2019-08-221-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |