Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6441 from ↵ | Henning Baldersheim | 2018-07-20 | 2 | -4/+92 |
|\ | | | | | | | | | vespa-engine/balder/add-prune-interface-to-minimise-update Add a prune method that can be used to remove updates that will have … | ||||
| * | Remove a restriction that is not necessary since FieldUpdates are applied first. | Henning Baldersheim | 2018-07-20 | 1 | -2/+0 |
| | | |||||
| * | Update javadoc. | Henning Baldersheim | 2018-07-20 | 1 | -10/+10 |
| | | | | | | | | Improve error message and produce it in one place. | ||||
| * | Add a prune method that can be used to remove updates that will have no ↵ | Henning Baldersheim | 2018-07-20 | 2 | -0/+90 |
| | | | | | | | | | | | | effect when applied. Currently will only affect ASSIGN updates. | ||||
* | | Merge pull request #6442 from vespa-engine/balder/add-reorder-fence | Henning Baldersheim | 2018-07-20 | 1 | -0/+1 |
|\ \ | | | | | | | Add a reorder fence. | ||||
| * | | Add a reorder fence. | Henning Baldersheim | 2018-07-20 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #6439 from vespa-engine/balder/lift-rankitem | Henning Baldersheim | 2018-07-20 | 7 | -69/+100 |
|\ \ | | | | | | | Balder/lift rankitem | ||||
| * | | Only necessary to do the cast once. | Henning Baldersheim | 2018-07-20 | 1 | -2/+3 |
| | | | |||||
| * | | Add a test that RankItems stay on top after whitelisting. | Henning Baldersheim | 2018-07-20 | 2 | -0/+40 |
| | | | |||||
| * | | If the root is a RankItem, add the whitelist to the first child in an and. | Henning Baldersheim | 2018-07-20 | 1 | -4/+12 |
| | | | |||||
| * | | Use override keyword | Henning Baldersheim | 2018-07-20 | 2 | -3/+3 |
| | | | |||||
| * | | Use = default and C++11 for loops where possible. No semantic changes. | Henning Baldersheim | 2018-07-20 | 4 | -62/+44 |
| | | | |||||
* | | | Merge pull request #6438 from vespa-engine/bratseth/handle-missing-content-type | Henrik Høiness | 2018-07-20 | 1 | -5/+3 |
|\ \ \ | |_|/ |/| | | Handle missing content type | ||||
| * | | Handle missing content type | Jon Bratseth | 2018-07-20 | 1 | -5/+3 |
| |/ | |||||
* | | Merge pull request #6437 from ↵ | Henning Baldersheim | 2018-07-20 | 1 | -2/+5 |
|\ \ | | | | | | | | | | | | | vespa-engine/balder/ensure-that-there-is-at-least-1-valid-stopsign-visible-at-all-times There must always be a stopsign visible to any concurrent reader no m… | ||||
| * | | There must always be a stopsign visible to any concurrent reader no matter ↵ | Henning Baldersheim | 2018-07-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | where it is. So before removing the old stopsign, the new one must be placed. You can only remove the old one if it was ahead of new one. If not, any readers scanning might have passed the location of the new one, and the old one might be gone before it gets there. And hence it will continue into space or a concrete wall. | ||||
* | | | Merge pull request #6436 from ↵ | Henning Baldersheim | 2018-07-20 | 17 | -201/+283 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/balder/choose-invalidate-or-update-of-cache Balder/choose invalidate or update of cache | ||||
| * | | | Properly test writethrough on UPDATE strategy | Henning Baldersheim | 2018-07-19 | 1 | -14/+37 |
| | | | | |||||
| * | | | Properly test both INVALIDATE and UPDATE strategy. Fix bug with incorrect ↵ | Henning Baldersheim | 2018-07-19 | 5 | -66/+100 |
| | | | | | | | | | | | | | | | | size calculations on updating existing elements. | ||||
| * | | | Add control of cache update policy when an item changes value. | Henning Baldersheim | 2018-07-19 | 16 | -133/+158 |
| | | | | |||||
* | | | | Merge pull request #6422 from vespa-engine/arnej/sync-defaults-apis | Arne H Juul | 2018-07-20 | 4 | -56/+174 |
|\ \ \ \ | |_|_|/ |/| | | | bring C++ and Java APIs into sync | ||||
| * | | | reorder to get all defaults in the same place | Arne Juul | 2018-07-19 | 2 | -11/+26 |
| | | | | |||||
| * | | | add dump-everything debug aid | Arne Juul | 2018-07-19 | 1 | -0/+26 |
| | | | | |||||
| * | | | refactor to look more like java version | Arne Juul | 2018-07-19 | 1 | -29/+69 |
| | | | | |||||
| * | | | fix typo | Arne Juul | 2018-07-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | bring C++ and Java APIs into sync | Arne Juul | 2018-07-18 | 3 | -19/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect and make accessible port numbers to use for config server / config proxy from Java also. * port numbers are relative to VESPA_PORT_BASE if not explicitly specified. * try to make the logic in C++ and Java more similar. | ||||
* | | | | Merge pull request #6435 from vespa-engine/gjoranv/guava-version | Harald Musum | 2018-07-20 | 8 | -13/+6 |
|\ \ \ \ | |_|_|/ |/| | | | Use the guava version from container-dep-versions everywhere. | ||||
| * | | | Use the guava version from container-dep-versions everywhere. | gjoranv | 2018-07-19 | 8 | -13/+6 |
| | | | | |||||
* | | | | Merge pull request #6434 from ↵ | Jon Bratseth | 2018-07-19 | 1 | -18/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/musum/minimal-mode-versions-for-one-more-zone Musum/minimal mode versions for one more zone | ||||
| * | | | | Add one more zone to set where we should load minimal set of config model ↵ | Harald Musum | 2018-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | versions | ||||
| * | | | | Split out code to find versions to load into a method | Harald Musum | 2018-07-19 | 1 | -18/+21 |
| |/ / / | |||||
* | | | | Merge pull request #6430 from vespa-engine/freva/construct-services.xml | Valerij Fredriksen | 2018-07-19 | 9 | -19/+256 |
|\ \ \ \ | |/ / / |/| | | | Assemble test-runner application package | ||||
| * | | | Assemble test application package | Valerij Fredriksen | 2018-07-19 | 1 | -3/+5 |
| | | | | |||||
| * | | | Rename test package ArtifactRepository methods | Valerij Fredriksen | 2018-07-19 | 3 | -8/+8 |
| | | | | |||||
| * | | | Generate services.xml | Valerij Fredriksen | 2018-07-19 | 3 | -3/+111 |
| | | | | |||||
| * | | | Add ZipBuilder | Valerij Fredriksen | 2018-07-19 | 2 | -0/+131 |
| | | | | |||||
| * | | | Remove unused imports | Valerij Fredriksen | 2018-07-19 | 3 | -5/+1 |
| | | | | |||||
* | | | | Merge pull request #6433 from vespa-engine/gjoranv/exclude-opennlp2 | gjoranv | 2018-07-19 | 2 | -6/+17 |
|\ \ \ \ | | | | | | | | | | | Explicitly exclude opennlp from indexinglanguage | ||||
| * | | | | Explicitly exclude opennlp from indexinglanguage | gjoranv | 2018-07-19 | 2 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | .. and add it to application for the test classpath. | ||||
* | | | | | Merge pull request #6432 from ↵ | Valerij Fredriksen | 2018-07-19 | 1 | -23/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | vespa-engine/hmusum/remove-unused-method-and-default-implementation Remove unused method and unneeded default implementation | ||||
| * | | | | Remove unused method and unneeded default implementation | Harald Musum | 2018-07-19 | 1 | -23/+1 |
|/ / / / | |||||
* | | | | Merge pull request #6431 from ↵ | Jon Bratseth | 2018-07-19 | 2 | -59/+64 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/move-bootstrap-logic-to-bootstrap-class Move redeployment when bootstrapping logic to bootstrap class | ||||
| * | | | | Move redeployment when bootsrapping logic to boostrap class | Harald Musum | 2018-07-19 | 2 | -59/+64 |
| | | | | | |||||
* | | | | | Merge pull request #6429 from vespa-engine/gjoranv/exclude-opennlp | Jon Bratseth | 2018-07-19 | 2 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Do not expose opennlp in the maven dependency graph. | ||||
| * | | | | Do not expose opennlp in the maven dependency graph. | gjoranv | 2018-07-19 | 2 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #6423 from vespa-engine/henrhoi/querybuilder-help-section | Henrik Høiness | 2018-07-19 | 3 | -1/+63 |
|\ \ \ \ \ | |/ / / / |/| | | | | henrhoi/querybuilder-help-section | ||||
| * | | | | Solved conflict between files | Henrik | 2018-07-19 | 23 | -1188/+343 |
| |\ \ \ \ | |||||
| * | | | | | Removed logging to console | Henrik | 2018-07-18 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Added information about querybuilders features and help-section. Show/Hide ↵ | Henrik | 2018-07-18 | 3 | -1/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | section with button | ||||
* | | | | | | Merge pull request #6427 from vespa-engine/arnej/avoid-fork-to-kill | Henning Baldersheim | 2018-07-19 | 5 | -6/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | just exit on out of memory |