aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6441 from ↵Henning Baldersheim2018-07-202-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 Baldersheim2018-07-201-2/+0
| |
| * Update javadoc.Henning Baldersheim2018-07-201-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 Baldersheim2018-07-202-0/+90
| | | | | | | | | | | | effect when applied. Currently will only affect ASSIGN updates.
* | Merge pull request #6442 from vespa-engine/balder/add-reorder-fenceHenning Baldersheim2018-07-201-0/+1
|\ \ | | | | | | Add a reorder fence.
| * | Add a reorder fence.Henning Baldersheim2018-07-201-0/+1
|/ /
* | Merge pull request #6439 from vespa-engine/balder/lift-rankitemHenning Baldersheim2018-07-207-69/+100
|\ \ | | | | | | Balder/lift rankitem
| * | Only necessary to do the cast once.Henning Baldersheim2018-07-201-2/+3
| | |
| * | Add a test that RankItems stay on top after whitelisting.Henning Baldersheim2018-07-202-0/+40
| | |
| * | If the root is a RankItem, add the whitelist to the first child in an and.Henning Baldersheim2018-07-201-4/+12
| | |
| * | Use override keywordHenning Baldersheim2018-07-202-3/+3
| | |
| * | Use = default and C++11 for loops where possible. No semantic changes.Henning Baldersheim2018-07-204-62/+44
| | |
* | | Merge pull request #6438 from vespa-engine/bratseth/handle-missing-content-typeHenrik Høiness2018-07-201-5/+3
|\ \ \ | |_|/ |/| | Handle missing content type
| * | Handle missing content typeJon Bratseth2018-07-201-5/+3
| |/
* | Merge pull request #6437 from ↵Henning Baldersheim2018-07-201-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 Baldersheim2018-07-201-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 Baldersheim2018-07-2017-201/+283
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/balder/choose-invalidate-or-update-of-cache Balder/choose invalidate or update of cache
| * | | Properly test writethrough on UPDATE strategyHenning Baldersheim2018-07-191-14/+37
| | | |
| * | | Properly test both INVALIDATE and UPDATE strategy. Fix bug with incorrect ↵Henning Baldersheim2018-07-195-66/+100
| | | | | | | | | | | | | | | | size calculations on updating existing elements.
| * | | Add control of cache update policy when an item changes value.Henning Baldersheim2018-07-1916-133/+158
| | | |
* | | | Merge pull request #6422 from vespa-engine/arnej/sync-defaults-apisArne H Juul2018-07-204-56/+174
|\ \ \ \ | |_|_|/ |/| | | bring C++ and Java APIs into sync
| * | | reorder to get all defaults in the same placeArne Juul2018-07-192-11/+26
| | | |
| * | | add dump-everything debug aidArne Juul2018-07-191-0/+26
| | | |
| * | | refactor to look more like java versionArne Juul2018-07-191-29/+69
| | | |
| * | | fix typoArne Juul2018-07-191-1/+1
| | | |
| * | | bring C++ and Java APIs into syncArne Juul2018-07-183-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-versionHarald Musum2018-07-208-13/+6
|\ \ \ \ | |_|_|/ |/| | | Use the guava version from container-dep-versions everywhere.
| * | | Use the guava version from container-dep-versions everywhere.gjoranv2018-07-198-13/+6
| | | |
* | | | Merge pull request #6434 from ↵Jon Bratseth2018-07-191-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 Musum2018-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | versions
| * | | | Split out code to find versions to load into a methodHarald Musum2018-07-191-18/+21
| |/ / /
* | | | Merge pull request #6430 from vespa-engine/freva/construct-services.xmlValerij Fredriksen2018-07-199-19/+256
|\ \ \ \ | |/ / / |/| | | Assemble test-runner application package
| * | | Assemble test application packageValerij Fredriksen2018-07-191-3/+5
| | | |
| * | | Rename test package ArtifactRepository methodsValerij Fredriksen2018-07-193-8/+8
| | | |
| * | | Generate services.xmlValerij Fredriksen2018-07-193-3/+111
| | | |
| * | | Add ZipBuilderValerij Fredriksen2018-07-192-0/+131
| | | |
| * | | Remove unused importsValerij Fredriksen2018-07-193-5/+1
| | | |
* | | | Merge pull request #6433 from vespa-engine/gjoranv/exclude-opennlp2gjoranv2018-07-192-6/+17
|\ \ \ \ | | | | | | | | | | Explicitly exclude opennlp from indexinglanguage
| * | | | Explicitly exclude opennlp from indexinglanguagegjoranv2018-07-192-6/+17
| | | | | | | | | | | | | | | | | | | | .. and add it to application for the test classpath.
* | | | | Merge pull request #6432 from ↵Valerij Fredriksen2018-07-191-23/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/hmusum/remove-unused-method-and-default-implementation Remove unused method and unneeded default implementation
| * | | | Remove unused method and unneeded default implementationHarald Musum2018-07-191-23/+1
|/ / / /
* | | | Merge pull request #6431 from ↵Jon Bratseth2018-07-192-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 classHarald Musum2018-07-192-59/+64
| | | | |
* | | | | Merge pull request #6429 from vespa-engine/gjoranv/exclude-opennlpJon Bratseth2018-07-192-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | Do not expose opennlp in the maven dependency graph.
| * | | | Do not expose opennlp in the maven dependency graph.gjoranv2018-07-192-1/+4
| | | | |
* | | | | Merge pull request #6423 from vespa-engine/henrhoi/querybuilder-help-sectionHenrik Høiness2018-07-193-1/+63
|\ \ \ \ \ | |/ / / / |/| | | | henrhoi/querybuilder-help-section
| * | | | Solved conflict between filesHenrik2018-07-1923-1188/+343
| |\ \ \ \
| * | | | | Removed logging to consoleHenrik2018-07-181-2/+0
| | | | | |
| * | | | | Added information about querybuilders features and help-section. Show/Hide ↵Henrik2018-07-183-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | section with button
* | | | | | Merge pull request #6427 from vespa-engine/arnej/avoid-fork-to-killHenning Baldersheim2018-07-195-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | just exit on out of memory