summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused parameters from ZtsClient methodsBjørn Christian Seime2019-08-267-33/+8
* Merge pull request #10407 from vespa-engine/mpolden/handle-multiple-rotations...Martin Polden2019-08-265-23/+150
|\
| * Include status of all rotations in application APIMartin Polden2019-08-265-23/+150
* | Merge pull request #10403 from vespa-engine/hakonhall/locate-mvn-from-pathJon Marius Venstad2019-08-261-4/+1
|\ \
| * | Locate mvn from PATHHåkon Hallingstad2019-08-261-4/+1
* | | Merge pull request #10405 from vespa-engine/bratseth/add-not-to-notJon Bratseth2019-08-264-20/+56
|\ \ \
| * | | Supoprt and'ing two not'sJon Bratseth2019-08-264-20/+56
| | |/ | |/|
* | | Merge pull request #10394 from vespa-engine/andreer/separate-store-for-app-certsAndreas Eriksen2019-08-267-56/+54
|\ \ \
| * | | separate zk path for application certificatesandreer2019-08-237-56/+54
* | | | Merge pull request #10398 from vespa-engine/toregge/add-workaround-for-aligne...Geir Storli2019-08-2610-56/+58
|\ \ \ \
| * | | | Fix class comment.Tor Egge2019-08-231-1/+1
| * | | | Rename UniqueStoreSaver => UniqueStoreEnumerator.Tor Egge2019-08-238-46/+45
| * | | | Trim down include.Tor Egge2019-08-231-1/+1
| * | | | Add workaround for use of deprecated AlignedEntryRefT.Tor Egge2019-08-234-8/+11
* | | | | Merge pull request #10397 from vespa-engine/geirst/rewrite-enum-store-diction...Geir Storli2019-08-265-82/+80
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change EnumStoreDictBase to inherit UniqueStoreDictionaryBase to use more fun...Geir Storli2019-08-235-60/+56
| * | | | Change typedef -> using.Geir Storli2019-08-231-22/+24
| | |_|/ | |/| |
* | | | Merge pull request #10389 from vespa-engine/mpolden/rotation-status-updaterMartin Polden2019-08-2614-131/+264
|\ \ \ \
| * | | | Remove rotation status from MetricsServiceMockMartin Polden2019-08-233-30/+7
| * | | | Retrieve rotation status from GlobalRoutingServiceMartin Polden2019-08-2313-101/+257
* | | | | Merge pull request #10399 from vespa-engine/bratseth/avoid-node-changes-on-st...Jon Bratseth2019-08-244-94/+143
|\ \ \ \ \
| * | | | | 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 vespa-engine/toregge/suppress-array-bounds-war...Henning Baldersheim2019-08-243-6/+6
|\ \ \ \ \
| * | | | | Suppress array bounds warning when compiling generated protobuf code.Tor Egge2019-08-233-6/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #10390 from vespa-engine/toregge/remove-unused-constexpr-i...Henning Baldersheim2019-08-241-2/+0
|\ \ \ \ \
| * | | | | Remove unused constexpr in document module.Tor Egge2019-08-231-2/+0
| |/ / / /
* | | | | Merge pull request #10395 from vespa-engine/toregge/remove-direct-dependency-...Henning Baldersheim2019-08-241-1/+0
|\ \ \ \ \
| * | | | | Remove unneeded direct library dependency, we already link to the cryptoTor Egge2019-08-231-1/+0
| |/ / / /
* | | | | Merge pull request #10396 from vespa-engine/balder/time-2-chronoHenning Baldersheim2019-08-246-24/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 dimensionsJon Bratseth2019-08-2213-131/+205
* | | | | 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