Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enforce CC timeouts in Orchestrator 2 | Håkon Hallingstad | 2018-10-23 | 31 | -362/+661 |
| | |||||
* | Merge pull request #7415 from vespa-engine/bratseth/allow-conflicting-aliases | Jon Bratseth | 2018-10-23 | 2 | -26/+28 |
|\ | | | | | Allow conflicting aliases across document types | ||||
| * | Allow conflicting aliases across document types | Jon Bratseth | 2018-10-23 | 2 | -26/+28 |
|/ | |||||
* | Merge pull request #7411 from ↵ | Arnstein Ressem | 2018-10-23 | 9 | -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 Solbakken | 2018-10-23 | 9 | -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 Ressem | 2018-10-23 | 9 | -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 Musum | 2018-10-23 | 9 | -106/+33 |
|/ | |||||
* | Merge pull request #7409 from ↵ | Jon Bratseth | 2018-10-23 | 6 | -85/+306 |
|\ | | | | | | | | | vespa-engine/revert-7380-bratseth/segment-yql-by-default Revert "Bratseth/segment yql by default" | ||||
| * | Revert "Bratseth/segment yql by default" | Harald Musum | 2018-10-22 | 6 | -85/+306 |
|/ | |||||
* | Merge pull request #7407 from ↵ | Henning Baldersheim | 2018-10-22 | 9 | -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 Baldersheim | 2018-10-22 | 2 | -25/+2 |
| | | |||||
| * | Revert "Revert "Balder/avoid caching stuff you already have access t"" | Henning Baldersheim | 2018-10-22 | 7 | -87/+53 |
| | | |||||
* | | Merge pull request #7398 from vespa-engine/arnej/add-security-utils | Henning Baldersheim | 2018-10-22 | 0 | -0/+0 |
|\ \ | | | | | | | add security-utils | ||||
| * | | add security-utils | Arne Juul | 2018-10-22 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #7401 from vespa-engine/mortent/routing-age-based-on-tmpfile | Morten Tokle | 2018-10-22 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Routing age based on tmpfile | ||||
| * | | | Use temp file age in routing-configage metric | Morten Tokle | 2018-10-22 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #7393 from vespa-engine/mortent/allow-okta-headers | Morten Tokle | 2018-10-22 | 1 | -4/+1 |
|\ \ \ \ | | | | | | | | | | | Allow okta headers | ||||
| * | | | | Allow okta headers | Morten Tokle | 2018-10-22 | 1 | -4/+1 |
| | | | | | |||||
* | | | | | Merge pull request #7399 from ↵ | Henning Baldersheim | 2018-10-22 | 9 | -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 arrays | Lester Solbakken | 2018-10-22 | 9 | -33/+106 |
| |/ / / / | |||||
* | | | | | Merge pull request #7406 from ↵ | Henning Baldersheim | 2018-10-22 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | vespa-engine/geirst/add-security-utils-to-root-cmake-lists Add security-utils. | ||||
| * | | | | Add security-utils. | Geir Storli | 2018-10-22 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #7394 from vespa-engine/arnej/less-attribute-prefetch | Henning Baldersheim | 2018-10-22 | 7 | -86/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | remove "attribute: prefetch" from unrelated tests | ||||
| * | | | | | remove "attribute: prefetch" from unrelated tests | Arne Juul | 2018-10-22 | 7 | -86/+70 |
| | | | | | | |||||
* | | | | | | Merge pull request #7385 from vespa-engine/balder/separate-send-reply-thread | Henning Baldersheim | 2018-10-22 | 2 | -11/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | To avoid replies being affected by send use 2 threads. | ||||
| * | | | | | | return after discard. | Henning Baldersheim | 2018-10-22 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spelling errors. | Henning Baldersheim | 2018-10-22 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | To avoid replies being affected by send use 2 threads. | Henning Baldersheim | 2018-10-19 | 1 | -9/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7397 from ↵ | Harald Musum | 2018-10-22 | 7 | -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 Musum | 2018-10-22 | 7 | -53/+87 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #7396 from vespa-engine/hmusum/fix-logging | Harald Musum | 2018-10-22 | 2 | -3/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | More logging when adding docker node fails | ||||
| * | | | | | | | More logging | Harald Musum | 2018-10-22 | 1 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | More logging when adding docker node fails | Harald Musum | 2018-10-22 | 1 | -1/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #7380 from vespa-engine/bratseth/segment-yql-by-default | Arne H Juul | 2018-10-22 | 6 | -306/+85 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Bratseth/segment yql by default | ||||
| * | | | | | | Segment 'contains' text by default | Jon Bratseth | 2018-10-19 | 3 | -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 only | Jon Bratseth | 2018-10-19 | 6 | -60/+60 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7366 from ↵ | Harald Musum | 2018-10-22 | 1 | -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 well | Harald Musum | 2018-10-18 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7387 from vespa-engine/havardpe/remove-hug | Henning Baldersheim | 2018-10-22 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | remove extra hug | ||||
| * | | | | | | remove extra hug | Håvard Pettersen | 2018-10-19 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7337 from vespa-engine/bratseth/allow-subset-matches | Harald Musum | 2018-10-22 | 3 | -36/+43 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Allow subset matches | ||||
| * | | | | | | Allow subset matches | Jon Bratseth | 2018-10-17 | 3 | -36/+43 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7373 from ↵ | Jon Marius Venstad | 2018-10-22 | 1 | -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 hosted | Jon Marius Venstad | 2018-10-19 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #7391 from ↵ | Harald Musum | 2018-10-22 | 7 | -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 Baldersheim | 2018-10-21 | 1 | -11/+11 |
| | | | | | | | | |||||
| * | | | | | | | Optional intended as a return value, not as fields. | Henning Baldersheim | 2018-10-21 | 1 | -13/+12 |
| | | | | | | | | |||||
| * | | | | | | | Only require Optional. + some intellij advise. | Henning Baldersheim | 2018-10-21 | 4 | -14/+13 |
| | | | | | | | | |||||
| * | | | | | | | GC unused parameters. | Henning Baldersheim | 2018-10-21 | 3 | -36/+15 |
| | | | | | | | | |||||
| * | | | | | | | No need to cache memoryPercentage as a member, when you already have access ↵ | Henning Baldersheim | 2018-10-21 | 1 | -15/+4 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | to it through the owning cluster. |