summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.98.2-1].vespa-7.98.2-1sd-buildbot2019-08-274-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=7.98.2 --no-auto-changelog
* Merge pull request #10399 from ↵Jon Bratseth2019-08-244-94/+143
|\ | | | | | | | | vespa-engine/bratseth/avoid-node-changes-on-startup Don't retire if we cannot fail
| * Request default resources2Jon Bratseth2019-08-241-1/+1
| |
| * Don't retire if we cannot failJon Bratseth2019-08-234-93/+142
| |
* | Merge pull request #10392 from ↵Henning Baldersheim2019-08-243-6/+6
|\ \ | | | | | | | | | | | | vespa-engine/toregge/suppress-array-bounds-warning-for-generated-protobuf-code Suppress array bounds warning when compiling generated protobuf code
| * | Suppress array bounds warning when compiling generated protobuf code.Tor Egge2019-08-233-6/+6
| | |
* | | Merge pull request #10390 from ↵Henning Baldersheim2019-08-241-2/+0
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-unused-constexpr-in-document Remove unused constexpr in document module
| * | | Remove unused constexpr in document module.Tor Egge2019-08-231-2/+0
| |/ /
* | | Merge pull request #10395 from ↵Henning Baldersheim2019-08-241-1/+0
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-direct-dependency-to-crypto-library Remove unneeded direct crypto library dependency.
| * | | Remove unneeded direct library dependency, we already link to the cryptoTor Egge2019-08-231-1/+0
| |/ / | | | | | | | | | library due to vespalib dependency.
* | | Merge pull request #10396 from vespa-engine/balder/time-2-chronoHenning Baldersheim2019-08-246-24/+22
|\ \ \ | |_|/ |/| | time(0) to chrono::steady_clock
| * | Use system clock for safety.Henning Baldersheim2019-08-231-6/+2
| | |
| * | time(0) to chrono::steady_clock.Henning Baldersheim2019-08-236-19/+21
|/ /
* | Merge pull request #10376 from vespa-engine/bratseth/handle-inherited-variantsArne H Juul2019-08-2313-131/+205
|\ \ | | | | | | Handle inherited variants with different dimensions
| * | Handle inherited variants with different dimensionsJon Bratseth2019-08-2213-131/+205
| | |
* | | Merge pull request #10391 from vespa-engine/bjorncs/security-utilsØyvind Grønnesby2019-08-231-1/+2
|\ \ \ | |_|/ |/| | Bjorncs/security utils MERGEOK
| * | Use correct key factory for key typeBjørn Christian Seime2019-08-231-1/+2
|/ /
* | Merge pull request #10388 from ↵Arnstein Ressem2019-08-235-21/+31
|\ \ | | | | | | | | | | | | vespa-engine/revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14 Revert "Upgrade to zookeeper 3.4.14, take 3" MERGEOK
| * | 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
|\ \ | | | | | | Flavor overrides REST API
| * | 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
|\ \ \ | | | | | | | | Geirst/rewrite enum store dictionary
| * | | 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 ↵Geir Storli2019-08-224-31/+57
| | | | | | | | | | | | | | | | argument.
* | | | Merge pull request #10370 from ↵Harald Musum2019-08-235-31/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14 Upgrade to zookeeper 3.4.14, take 3
| * | | | Exclusion is not needed anymoreHarald Musum2019-08-221-9/+0
| | | | |
| * | | | Merge branch 'master' into ↵Harald Musum2019-08-2286-971/+715
| |\ \ \ \ | | | | | | | | | | | | | | | | | | revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
| * | | | | 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 ↵Jon Marius Venstad2019-08-231-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/add-localmavenbin-to-path-for-vespa-applications-if-it-exists Add local/maven/bin to PATH for Vespa applications, if it exists
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Jvenstad/more mojos
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Assign name to config thread
| * | | | | | | 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 ↵Ola Aunrønning2019-08-221-11/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/olaa/storedinteger-last-modified-time Add last modified time to StoredInteger
| * | | | | | | | Add last modified time to StoredIntegerOla Aunrønning2019-08-221-11/+25
| | | | | | | | |
* | | | | | | | | Merge pull request #10385 from ↵Bjørn Christian Seime2019-08-226-14/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/really-make-groupingSessionCache-default-on Enable grouping session cache default.
| * | | | | | | | | 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 injection
| * | | | | | | | | Remove unused class. Config now received via injectionTor Brede Vekterli2019-08-221-35/+0
| | | | | | | | | |