Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10391 from vespa-engine/bjorncs/security-utils | Øyvind Grønnesby | 2019-08-23 | 1 | -1/+2 |
|\ | |||||
| * | Use correct key factory for key type | Bjørn Christian Seime | 2019-08-23 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #10388 from vespa-engine/revert-10370-revert-10346-revert-... | Arnstein Ressem | 2019-08-23 | 5 | -21/+31 |
|\ | |||||
| * | Revert "Upgrade to zookeeper 3.4.14, take 3" | Harald Musum | 2019-08-23 | 5 | -21/+31 |
|/ | |||||
* | Merge pull request #10382 from vespa-engine/freva/flavor-overrides-rest | Valerij Fredriksen | 2019-08-23 | 8 | -12/+156 |
|\ | |||||
| * | Add alternative names | Valerij Fredriksen | 2019-08-23 | 1 | -0/+4 |
| * | Add tests | Valerij Fredriksen | 2019-08-22 | 1 | -0/+66 |
| * | Allow patching node resources | Valerij Fredriksen | 2019-08-22 | 1 | -0/+13 |
| * | Allow adding new nodes with resources | Valerij Fredriksen | 2019-08-22 | 1 | -1/+39 |
| * | Add methods to easily modify Flavor | Valerij Fredriksen | 2019-08-22 | 5 | -11/+34 |
* | | Merge pull request #10384 from vespa-engine/geirst/rewrite-enum-store-dictionary | Geir Storli | 2019-08-23 | 8 | -231/+188 |
|\ \ | |||||
| * | | Rename template argument. | Geir Storli | 2019-08-23 | 2 | -37/+34 |
| * | | Rewrite enum store dictionary to inherit unique store dictionary. | Geir Storli | 2019-08-22 | 6 | -196/+130 |
| * | | Change unique store dictionary to take btree dictionary type as template argu... | Geir Storli | 2019-08-22 | 4 | -31/+57 |
* | | | Merge pull request #10370 from vespa-engine/revert-10346-revert-10336-hmusum/... | Harald Musum | 2019-08-23 | 5 | -31/+21 |
|\ \ \ | |||||
| * | | | Exclusion is not needed anymore | Harald Musum | 2019-08-22 | 1 | -9/+0 |
| * | | | Merge branch 'master' into revert-10346-revert-10336-hmusum/upgrade-to-zookee... | Harald Musum | 2019-08-22 | 86 | -971/+715 |
| |\ \ \ | |||||
| * | | | | Indentation | Harald Musum | 2019-08-22 | 1 | -3/+2 |
| * | | | | Remove NonNull annotations | Harald Musum | 2019-08-22 | 3 | -26/+13 |
| * | | | | Exclude com.github.spotbugs:spotbugs-annotations | Harald Musum | 2019-08-21 | 1 | -0/+13 |
| * | | | | Revert "Revert "Upgrade to ZooKeeper 3.4.14"" | Harald Musum | 2019-08-21 | 1 | -2/+2 |
* | | | | | Merge pull request #10377 from vespa-engine/hakonhall/add-localmavenbin-to-pa... | Jon Marius Venstad | 2019-08-23 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add local/maven/bin to PATH for Vespa applications, if it exists | Håkon Hallingstad | 2019-08-22 | 1 | -0/+2 |
* | | | | | | Merge pull request #10378 from vespa-engine/jvenstad/more-mojos | Jon Marius Venstad | 2019-08-23 | 12 | -29/+197 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add effective services mojo | Jon Marius Venstad | 2019-08-22 | 8 | -2/+164 |
| * | | | | | | Factor out abstract mojo on deployment level | Jon Marius Venstad | 2019-08-22 | 4 | -27/+33 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #10383 from vespa-engine/bjorncs/config-thread-name | Henning Baldersheim | 2019-08-22 | 1 | -23/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused field | Bjørn Christian Seime | 2019-08-22 | 1 | -9/+0 |
| * | | | | | | Assign name to config thread | Bjørn Christian Seime | 2019-08-22 | 1 | -16/+13 |
* | | | | | | | Merge pull request #10387 from vespa-engine/olaa/storedinteger-last-modified-... | Ola Aunrønning | 2019-08-22 | 1 | -11/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add last modified time to StoredInteger | Ola Aunrønning | 2019-08-22 | 1 | -11/+25 |
* | | | | | | | | Merge pull request #10385 from vespa-engine/balder/really-make-groupingSessio... | Bjørn Christian Seime | 2019-08-22 | 6 | -14/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enable grouping session cache default. | Henning Baldersheim | 2019-08-22 | 6 | -14/+19 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #10379 from vespa-engine/vekterli/remove-unused-class | Bjørn Christian Seime | 2019-08-22 | 1 | -35/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unused class. Config now received via injection | Tor Brede Vekterli | 2019-08-22 | 1 | -35/+0 |
* | | | | | | | | | Merge pull request #10380 from vespa-engine/bjorncs/fix-config-resource-leak | Bjørn Christian Seime | 2019-08-22 | 3 | -13/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Close config subscriber after getting config | Bjørn Christian Seime | 2019-08-22 | 3 | -13/+10 |
* | | | | | | | | | Merge pull request #10381 from vespa-engine/balder/deprecate-getId-with-version | Henning Baldersheim | 2019-08-22 | 5 | -10/+11 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Deprecate getId(version) and remove usage. | Henning Baldersheim | 2019-08-22 | 5 | -10/+11 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #10375 from vespa-engine/balder/soft_doom_factor-metric | Henning Baldersheim | 2019-08-22 | 3 | -14/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Expose backend metrics for soft_doom_factor. | Henning Baldersheim | 2019-08-22 | 1 | -0/+8 |
| * | | | | | | | | Add soft_doom_factor metric production per rankprofile in the backend. | Henning Baldersheim | 2019-08-22 | 2 | -14/+17 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #10362 from vespa-engine/balder/remove-v6-and-v7-rebased-1 | Henning Baldersheim | 2019-08-22 | 56 | -2567/+209 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Preserve constness. | Henning Baldersheim | 2019-08-22 | 1 | -2/+2 |
| * | | | | | | | Remove 42 serialize code | Henning Baldersheim | 2019-08-21 | 2 | -10/+0 |
| * | | | | | | | Do not generate old formats, not even in tests. | Henning Baldersheim | 2019-08-21 | 7 | -160/+98 |
| * | | | | | | | Remove v6/v7 on c++ side too | Henning Baldersheim | 2019-08-21 | 9 | -162/+26 |
| * | | | | | | | Update to require atleast vespa 6 version. | Henning Baldersheim | 2019-08-21 | 8 | -780/+31 |
| * | | | | | | | Remove v6 and v7 from java side. | Henning Baldersheim | 2019-08-21 | 36 | -1457/+56 |
* | | | | | | | | Merge pull request #10374 from vespa-engine/hakonhall/etcprofiled-scripts-are... | Arnstein Ressem | 2019-08-22 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | |