summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Implicitly enable multiple bucket spaces"Tor Brede Vekterli2018-05-308-36/+149
* Merge pull request #5990 from vespa-engine/bratseth/avoid-string-reencodingArne H Juul2018-05-307-144/+288
|\
| * Avoid encoding between utf-8 and 16 unnecessarilyJon Bratseth2018-05-297-144/+288
* | Merge pull request #6000 from vespa-engine/hmusum/require-file-reference-to-b...Harald Musum2018-05-301-1/+3
|\ \
| * | Require file reference to be non-nullHarald Musum2018-05-301-1/+3
* | | Merge pull request #6002 from vespa-engine/gjoranv/fat-model-deps2Harald Musum2018-05-305-186/+244
|\ \ \ | |/ / |/| |
| * | Add new module fat-model-dependenciesgjoranv2018-05-305-186/+244
* | | Merge pull request #5855 from vespa-engine/vekterli/implicitly-enable-multipl...Tor Brede Vekterli2018-05-308-149/+36
|\ \ \ | |/ / |/| |
| * | Implicitly enable multiple bucket spaces in config modelTor Brede Vekterli2018-05-094-136/+23
| * | Add default bucket space mapping for test document typeTor Brede Vekterli2018-05-091-1/+5
| * | Implicitly enable multiple bucket spaces in content backendTor Brede Vekterli2018-05-093-12/+8
* | | Merge pull request #5997 from vespa-engine/balder/inline-and-finalGeir Storli2018-05-304-91/+21
|\ \ \
| * | | Inline and final where possible and sensible.Henning Baldersheim2018-05-304-91/+21
|/ / /
* | | Merge pull request #5987 from vespa-engine/freva/propagate-nasu-ConvergenceEx...Valerij Fredriksen2018-05-305-36/+71
|\ \ \
| * | | Propagate NodeAdminStateUpdater convergence exceptionValerij Fredriksen2018-05-295-36/+71
* | | | Merge pull request #5981 from vespa-engine/freva/add-suspendConvergeValerij Fredriksen2018-05-301-13/+33
|\ \ \ \
| * | | | suspendConverge() -> convergeSuspend()Valerij Fredriksen2018-05-291-4/+4
| * | | | Fix javadocValerij Fredriksen2018-05-291-19/+21
| * | | | Add suspendConverge()Valerij Fredriksen2018-05-291-0/+18
| |/ / /
* | | | Merge pull request #5996 from vespa-engine/revert-5995-gjoranv/fat-model-depsHarald Musum2018-05-305-249/+186
|\ \ \ \
| * | | | Revert "Add new module fat-model-dependencies"Harald Musum2018-05-305-249/+186
|/ / / /
* | | | Merge pull request #5995 from vespa-engine/gjoranv/fat-model-depsHarald Musum2018-05-305-186/+249
|\ \ \ \
| * | | | Add new module fat-model-dependenciesgjoranv2018-05-295-186/+249
* | | | | Merge pull request #5992 from vespa-engine/havardpe/same-element-iteratorArne H Juul2018-05-298-0/+396
|\ \ \ \ \
| * | | | | SameElement blueprint and search iteratorHåvard Pettersen2018-05-298-0/+396
* | | | | | Merge pull request #5982 from vespa-engine/hmusum/different-expiry-times-for-...Harald Musum2018-05-291-3/+5
|\ \ \ \ \ \
| * | | | | | Use lower expiry times and shorter intervals for non-main systemsHarald Musum2018-05-291-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5941 from vespa-engine/balder/same-element-in-backendHenning Baldersheim2018-05-2957-608/+608
|\ \ \ \ \ \
| * | | | | | And is a better fallback than Phrase for SameElement.Henning Baldersheim2018-05-291-1/+1
| * | | | | | Simplify by duplication for readabilityHenning Baldersheim2018-05-292-25/+36
| * | | | | | No allocation of matchdata for SameElement's children.Henning Baldersheim2018-05-291-1/+2
| * | | | | | No handling of SameElement here.Henning Baldersheim2018-05-292-10/+1
| * | | | | | Correct unique idsHenning Baldersheim2018-05-291-4/+4
| * | | | | | = defaultHenning Baldersheim2018-05-291-4/+4
| * | | | | | Add more testing of SameElement querybuildingHenning Baldersheim2018-05-291-0/+14
| * | | | | | SameEelemt is not a term.Henning Baldersheim2018-05-291-9/+10
| * | | | | | Remove termlikeness and expect fully qualified names for children from the qrs.Henning Baldersheim2018-05-2922-61/+79
| * | | | | | Add some simple SameElement testing.Henning Baldersheim2018-05-2512-60/+53
| * | | | | | Test addSameElementHenning Baldersheim2018-05-251-29/+21
| * | | | | | addPhrase -> addSameElementHenning Baldersheim2018-05-251-1/+1
| * | | | | | Add initial support for SameElement in backend too.Henning Baldersheim2018-05-2550-486/+465
* | | | | | | Merge pull request #5983 from vespa-engine/toregge/convert-put-and-update-ope...Henning Baldersheim2018-05-297-35/+118
|\ \ \ \ \ \ \
| * | | | | | | Add comment explaining why identity check is sufficient.Tor Egge2018-05-291-0/+5
| * | | | | | | Perform fixup on put and update operations using non-current document type repo.Tor Egge2018-05-297-35/+113
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5980 from vespa-engine/toregge/suppress-valgrind-warnings...Henning Baldersheim2018-05-291-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Suppress valgrind memory leak warning on fedora.Tor Egge2018-05-291-0/+8
| |/ / / / / /
* | | | | | | Merge pull request #5984 from vespa-engine/geirst/reapply-array-of-struct-fie...Henning Baldersheim2018-05-299-0/+216
|\ \ \ \ \ \ \
| * | | | | | | Support that array of struct field is derived into array attributes.Geir Storli2018-05-299-0/+216
| |/ / / / / /
* | | | | | | Merge pull request #5985 from vespa-engine/balder/remove-the-termlike-appeara...Henning Baldersheim2018-05-295-48/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Further test correct namesHenning Baldersheim2018-05-292-2/+15