summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Gather: simplify expression for constant scalar indicesLester Solbakken2020-06-271-7/+12
* Merge pull request #13667 from vespa-engine/hmusum/add-model-versions-to-resp...Harald Musum2020-06-268-33/+84
|\
| * Merge branch 'master' into hmusum/add-model-versions-to-responseHarald Musum2020-06-26207-1225/+4130
| |\ | |/ |/|
* | Merge pull request #13715 from vespa-engine/olaa/billing-api-handlerOla Aunrønning2020-06-2623-120/+1389
|\ \
| * | Add BillingApiHandlerOla Aunrønning2020-06-2623-120/+1389
* | | Merge pull request #13720 from vespa-engine/balder/cpp-modernizationHenning Baldersheim2020-06-266-55/+39
|\ \ \
| * | | Nested namespaceHenning Baldersheim2020-06-262-13/+7
| * | | 0 -> nullptrHenning Baldersheim2020-06-261-1/+1
| * | | Use std::moveHenning Baldersheim2020-06-263-6/+9
| * | | Modernize to c++11 style loops.Henning Baldersheim2020-06-264-39/+26
* | | | Merge pull request #13710 from vespa-engine/toregge/add-filter-iterators-for-...Geir Storli2020-06-2614-13/+404
|\ \ \ \
| * | | | Use uint16_t data type for loop variable over children.Tor Egge2020-06-261-1/+1
| * | | | Add filter iterators for weighted set blueprints.Tor Egge2020-06-2514-13/+404
* | | | | Merge pull request #13719 from vespa-engine/havardpe/ignore-trivial-dimensionsHåvard Pettersen2020-06-267-57/+75
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ignore trivial dimensionsHåvard Pettersen2020-06-267-57/+75
* | | | | Merge pull request #13714 from vespa-engine/hmusum/avoid-adding-local-session...Harald Musum2020-06-261-5/+8
|\ \ \ \ \
| * | | | | Method should be privateHarald Musum2020-06-261-1/+1
| * | | | | Avoid adding local session to session cache twiceHarald Musum2020-06-261-6/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #13718 from vespa-engine/balder/let-getExecutorId-be-a-pur...Henning Baldersheim2020-06-2610-52/+62
|\ \ \ \ \
| * | | | | Let getExecutorId be a pure interface.Henning Baldersheim2020-06-2610-52/+62
|/ / / / /
* | | | | Merge pull request #13709 from vespa-engine/bratseth/surrogate-aware-gram-spl...Jon Bratseth2020-06-266-40/+132
|\ \ \ \ \
| * | | | | Update ABI specJon Bratseth2020-06-261-1/+2
| * | | | | Surrogate aware gram splittingJon Bratseth2020-06-255-39/+130
* | | | | | Merge pull request #13696 from vespa-engine/bratseth/handle-existing-spanTree...Jon Bratseth2020-06-264-22/+22
|\ \ \ \ \ \
| * | | | | | Handle an existing spantree in exactmatchJon Bratseth2020-06-244-22/+22
* | | | | | | Merge pull request #13644 from vespa-engine/bjorncs/bundle-pluginBjørn Christian Seime2020-06-2610-306/+631
|\ \ \ \ \ \ \
| * | | | | | | Remove Mockito usageBjørn Christian Seime2020-06-252-11/+4
| * | | | | | | Implement goal for assembling test bundlesBjørn Christian Seime2020-06-243-94/+147
| * | | | | | | Implement goal for generating OSGi manifest for test bundlesBjørn Christian Seime2020-06-243-207/+305
| * | | | | | | Add helper class for test bundlesBjørn Christian Seime2020-06-241-0/+25
| * | | | | | | Introduce concept of 'test provided' scoped dependenciesBjørn Christian Seime2020-06-244-5/+161
| |/ / / / / /
* | | | | | | Merge pull request #13717 from vespa-engine/mortent/support-sharedl4-devMorten Tokle2020-06-262-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Support sharedl4 routing in manually deployed zonesMorten Tokle2020-06-262-0/+11
* | | | | | | | Merge pull request #13716 from vespa-engine/freva/avoid-out-of-memValerij Fredriksen2020-06-261-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use mutable integer insteadValerij Fredriksen2020-06-261-4/+5
| * | | | | | | Rename variable to make purpose clearerValerij Fredriksen2020-06-261-3/+3
| * | | | | | | Avoid going out of memory when deleting filesValerij Fredriksen2020-06-261-3/+5
|/ / / / / / /
* | | | | | | Merge pull request #13708 from vespa-engine/hmusum/copy-application-package-a...Harald Musum2020-06-261-1/+17
|\ \ \ \ \ \ \
| * | | | | | | Copy application package atomicallyHarald Musum2020-06-251-1/+17
* | | | | | | | Merge pull request #13713 from vespa-engine/revert-13711-vekterli/only-sort-onceHenning Baldersheim2020-06-262-75/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Only sort once during ideal group calculations"Arnstein Ressem2020-06-262-75/+24
|/ / / / / / / /
* | | | | | | | Merge pull request #13712 from vespa-engine/geirst/use-shared-executor-for-pr...Henning Baldersheim2020-06-2619-77/+177
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Use ForegroundThreadExecutor in unit tests.Geir Storli2020-06-255-17/+23
| * | | | | | | Run prepare step of two-phase puts in the shared executor instead of the attr...Geir Storli2020-06-255-24/+75
| * | | | | | | Expose the shared executor via attribute manager interface.Geir Storli2020-06-2514-52/+95
| * | | | | | | Rename function to be more descriptive.Geir Storli2020-06-251-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #13711 from vespa-engine/vekterli/only-sort-onceHenning Baldersheim2020-06-252-24/+75
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Only sort once during ideal group calculationsTor Brede Vekterli2020-06-252-24/+75
|/ / / / / /
* | | | | | Merge pull request #13704 from vespa-engine/balder/use-shared-executorHenning Baldersheim2020-06-2515-34/+43
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update the test to what is important for the adaptive executor.Henning Baldersheim2020-06-251-6/+2