aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7415 from vespa-engine/bratseth/allow-conflicting-aliasesJon Bratseth2018-10-232-26/+28
|\ | | | | Allow conflicting aliases across document types
| * Allow conflicting aliases across document typesJon Bratseth2018-10-232-26/+28
|/
* Merge pull request #7411 from ↵Arnstein Ressem2018-10-239-33/+106
|\ | | | | | | | | vespa-engine/lesters/revert-revert-disallow-complex-keys Revert "Revert "Disallow complex types as keys for nested types in arrays""
| * Revert "Revert "Disallow complex types as keys for nested types in arrays""Lester Solbakken2018-10-239-33/+106
|/ | | | | | | This reverts commit bb42d0c6f30de25b9ca6b8e232b6920aeb51a7d1. Reason for system tests failing was changes in the system tests, not this PR.
* Merge pull request #7410 from ↵Arnstein Ressem2018-10-239-106/+33
|\ | | | | | | | | vespa-engine/revert-7399-lesters/disallow-complex-types-as-key-in-arrays Revert "Disallow complex types as keys for nested types in arrays"
| * Revert "Disallow complex types as keys for nested types in arrays"Harald Musum2018-10-239-106/+33
|/
* Merge pull request #7409 from ↵Jon Bratseth2018-10-236-85/+306
|\ | | | | | | | | vespa-engine/revert-7380-bratseth/segment-yql-by-default Revert "Bratseth/segment yql by default"
| * Revert "Bratseth/segment yql by default"Harald Musum2018-10-226-85/+306
|/
* Merge pull request #7407 from ↵Henning Baldersheim2018-10-229-112/+55
|\ | | | | | | | | vespa-engine/revert-7397-revert-7391-balder/avoid-caching-stuff-you-already-have-access-t Revert "Revert "Balder/avoid caching stuff you already have access t""
| * GC more unused code.Henning Baldersheim2018-10-222-25/+2
| |
| * Revert "Revert "Balder/avoid caching stuff you already have access t""Henning Baldersheim2018-10-227-87/+53
| |
* | Merge pull request #7398 from vespa-engine/arnej/add-security-utilsHenning Baldersheim2018-10-220-0/+0
|\ \ | | | | | | add security-utils
| * | add security-utilsArne Juul2018-10-221-0/+1
| | |
* | | Merge pull request #7401 from vespa-engine/mortent/routing-age-based-on-tmpfileMorten Tokle2018-10-221-2/+2
|\ \ \ | | | | | | | | Routing age based on tmpfile
| * | | Use temp file age in routing-configage metricMorten Tokle2018-10-221-2/+2
| | | |
* | | | Merge pull request #7393 from vespa-engine/mortent/allow-okta-headersMorten Tokle2018-10-221-4/+1
|\ \ \ \ | | | | | | | | | | Allow okta headers
| * | | | Allow okta headersMorten Tokle2018-10-221-4/+1
| | | | |
* | | | | Merge pull request #7399 from ↵Henning Baldersheim2018-10-229-33/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/lesters/disallow-complex-types-as-key-in-arrays Disallow complex types as keys for nested types in arrays
| * | | | | Disallow complex types as keys for nested types in arraysLester Solbakken2018-10-229-33/+106
| |/ / / /
* | | | | Merge pull request #7406 from ↵Henning Baldersheim2018-10-221-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | vespa-engine/geirst/add-security-utils-to-root-cmake-lists Add security-utils.
| * | | | Add security-utils.Geir Storli2018-10-221-0/+1
| | | | |
* | | | | Merge pull request #7394 from vespa-engine/arnej/less-attribute-prefetchHenning Baldersheim2018-10-227-86/+70
|\ \ \ \ \ | | | | | | | | | | | | remove "attribute: prefetch" from unrelated tests
| * | | | | remove "attribute: prefetch" from unrelated testsArne Juul2018-10-227-86/+70
| | | | | |
* | | | | | Merge pull request #7385 from vespa-engine/balder/separate-send-reply-threadHenning Baldersheim2018-10-222-11/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | To avoid replies being affected by send use 2 threads.
| * | | | | | return after discard.Henning Baldersheim2018-10-221-0/+1
| | | | | | |
| * | | | | | Fix spelling errors.Henning Baldersheim2018-10-221-2/+2
| | | | | | |
| * | | | | | To avoid replies being affected by send use 2 threads.Henning Baldersheim2018-10-191-9/+17
| | | | | | |
* | | | | | | Merge pull request #7397 from ↵Harald Musum2018-10-227-53/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-7391-balder/avoid-caching-stuff-you-already-have-access-t Revert "Balder/avoid caching stuff you already have access t"
| * | | | | | | Revert "Balder/avoid caching stuff you already have access t"Harald Musum2018-10-227-53/+87
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #7396 from vespa-engine/hmusum/fix-loggingHarald Musum2018-10-222-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | More logging when adding docker node fails
| * | | | | | | More loggingHarald Musum2018-10-221-2/+4
| | | | | | | |
| * | | | | | | More logging when adding docker node failsHarald Musum2018-10-221-1/+2
| |/ / / / / /
* | | | | | | Merge pull request #7380 from vespa-engine/bratseth/segment-yql-by-defaultArne H Juul2018-10-226-306/+85
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Bratseth/segment yql by default
| * | | | | | Segment 'contains' text by defaultJon Bratseth2018-10-193-250/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current default is to not segment text given to 'contains' in YQL outside of userInput, which means that submitting text that is not pre-tokenized in exactly the same way as the tokenizer of the field won't work (such as the queries "contains 'foo bar'", or contains foo.bar). Because of this default choice, apparently some complicated logic was added to track when it needs to be automatically replaced with a more reasonable choice, in the case where one Vespa instance federates to another. I removed that now, because it doesn't seem necessary without the bad default.
| * | | | | | Nonfunctional changes onlyJon Bratseth2018-10-196-60/+60
| | | | | | |
* | | | | | | Merge pull request #7366 from ↵Harald Musum2018-10-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/require-2-nodes-per-cluster-in-cd-as-well Require 2 nodes per cluster in CD as well
| * | | | | | Require 2 nodes per cluster in CD as wellHarald Musum2018-10-181-1/+1
| | | | | | |
* | | | | | | Merge pull request #7387 from vespa-engine/havardpe/remove-hugHenning Baldersheim2018-10-221-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | remove extra hug
| * | | | | | remove extra hugHåvard Pettersen2018-10-191-2/+2
| | | | | | |
* | | | | | | Merge pull request #7337 from vespa-engine/bratseth/allow-subset-matchesHarald Musum2018-10-223-36/+43
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Allow subset matches
| * | | | | | Allow subset matchesJon Bratseth2018-10-173-36/+43
| | | | | | |
* | | | | | | Merge pull request #7373 from ↵Jon Marius Venstad2018-10-221-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/decouple-test-framework-version-for-open-base Decouple test framework version from vespa version, like in hosted
| * | | | | | | Decouple test framework version from vespa version, like in hostedJon Marius Venstad2018-10-191-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #7391 from ↵Harald Musum2018-10-227-87/+53
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/avoid-caching-stuff-you-already-have-access-t Balder/avoid caching stuff you already have access t
| * | | | | | | No more visibility than needed.Henning Baldersheim2018-10-211-11/+11
| | | | | | | |
| * | | | | | | Optional intended as a return value, not as fields.Henning Baldersheim2018-10-211-13/+12
| | | | | | | |
| * | | | | | | Only require Optional. + some intellij advise.Henning Baldersheim2018-10-214-14/+13
| | | | | | | |
| * | | | | | | GC unused parameters.Henning Baldersheim2018-10-213-36/+15
| | | | | | | |
| * | | | | | | No need to cache memoryPercentage as a member, when you already have access ↵Henning Baldersheim2018-10-211-15/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | to it through the owning cluster.
* | | | | | | Merge pull request #7390 from vespa-engine/kkraune/sec-upgradeHarald Musum2018-10-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | upgrade dep