summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.295.58-1].vespa-7.295.58-1sd-buildbot2020-10-054-1/+2
* Merge pull request #14699 from vespa-engine/balder/fix-testsHenning Baldersheim2020-10-039-20/+19
|\
| * Modify applyCommit to commit without updating synctoken if too early.Henning Baldersheim2020-10-033-4/+7
| * Use correct serial number when creating attribute.Henning Baldersheim2020-10-037-17/+13
|/
* Merge pull request #14698 from vespa-engine/toregge/move-queryenvironment-get...Henning Baldersheim2020-10-032-7/+11
|\
| * Move QueryEnvironment::getAllLocations member function definition to cpp file.Tor Egge2020-10-032-7/+11
* | Merge pull request #14697 from vespa-engine/balder/add-max-pendingHenning Baldersheim2020-10-031-40/+50
|\ \ | |/ |/|
| * Add description of max-pending parameter, and keep ordering.Henning Baldersheim2020-10-031-26/+27
| * Add maxpending which by default is 1000 to control max inflight.Henning Baldersheim2020-10-031-15/+24
* | Merge pull request #14696 from vespa-engine/toregge/include-pthread-header-wh...Henning Baldersheim2020-10-031-0/+1
|\ \ | |/ |/|
| * Include pthread.h when using pthread functions.Tor Egge2020-10-031-0/+1
* | Merge pull request #14694 from vespa-engine/balder/add-executor-wakeupHenning Baldersheim2020-10-0317-15/+57
|\ \
| * | Add wakeup call on the executors to allow to urgent wakeup of lazy exeutors o...Henning Baldersheim2020-10-0317-15/+57
| |/
* | Merge pull request #14695 from vespa-engine/toregge/move-storagelink-print-to...Henning Baldersheim2020-10-032-3/+7
|\ \ | |/ |/|
| * Move StorageLink::print member function definition to cpp file.Tor Egge2020-10-032-3/+7
|/
* Merge pull request #14682 from vespa-engine/mpolden/faster-tostringHenning Baldersheim2020-10-032-21/+40
|\
| * Remove custom Utf8.toString implementationMartin Polden2020-10-022-21/+40
* | Merge pull request #14693 from vespa-engine/toregge/stop-forward-declaring-st...Henning Baldersheim2020-10-031-1/+0
|\ \
| * | Don't forward declare std::thread.Tor Egge2020-10-031-1/+0
|/ /
* | Merge pull request #14692 from vespa-engine/toregge/handle-gcc-8Henning Baldersheim2020-10-034-3/+15
|\ \
| * | Handle gcc 8.Tor Egge2020-10-034-3/+15
|/ /
* | Merge pull request #14689 from vespa-engine/arnej/restore-lost-reserveArne H Juul2020-10-021-0/+1
|\ \
| * | lost a reserve() call in last refactoringArne Juul2020-10-021-0/+1
|/ /
* | Merge pull request #14688 from vespa-engine/balder/use-forground-executorHenning Baldersheim2020-10-021-9/+4
|\ \
| * | Use foreground executor.Henning Baldersheim2020-10-021-9/+4
* | | Merge pull request #14687 from vespa-engine/balder/add-option-to-control-sequ...Henning Baldersheim2020-10-021-7/+22
|\ \ \ | |/ / |/| |
| * | Add option to control sequencer used for attributesHenning Baldersheim2020-10-021-7/+22
|/ /
* | Merge pull request #14686 from vespa-engine/havardpe/benchmark-mergeHåvard Pettersen2020-10-021-4/+68
|\ \
| * | benchmark mergeHåvard Pettersen2020-10-021-4/+68
* | | Merge pull request #14676 from vespa-engine/bjorncs/jdisc-http-serviceJon Marius Venstad2020-10-021-1/+1
|\ \ \
| * | | Stabilize test - exception may fail out request between commit and response w...Bjørn Christian Seime2020-10-021-1/+1
* | | | Merge pull request #14684 from vespa-engine/jonmv/doc-v1-async-call-completio...Bjørn Christian Seime2020-10-021-4/+18
|\ \ \ \
| * | | | Call completion handlers earlier when receiving data/close in doc/v1/handlerJon Marius Venstad2020-10-021-4/+18
* | | | | Merge pull request #14678 from vespa-engine/revert-14673-revert-14636-hmusum/...Harald Musum2020-10-028-53/+44
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Go back to creating waiter before prepareHarald Musum2020-10-021-1/+2
| * | | | Revert "Revert "Cleanup some config server code ""Harald Musum2020-10-028-55/+45
| | |/ / | |/| |
* | | | Merge pull request #14681 from vespa-engine/havardpe/generic-reduceHåvard Pettersen2020-10-0216-90/+918
|\ \ \ \
| * \ \ \ Merge branch 'master' into havardpe/generic-reduceHåvard Pettersen2020-10-0237-349/+1169
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #14680 from vespa-engine/arnej/add-generic-mixed-mergeArne H Juul2020-10-028-14/+270
|\ \ \ \ \
| * | | | | fix commentArne Juul2020-10-021-1/+1
| * | | | | add test for GenericMerge instructionArne Juul2020-10-023-0/+92
| * | | | | add GenericMerge instructionArne Juul2020-10-023-0/+163
| * | | | | use typify_invoke instead of explicit switchArne Juul2020-10-021-13/+14
| | |/ / / | |/| | |
* | | | | Merge pull request #14679 from vespa-engine/bratseth/dont-reactivate-on-retir...Jon Bratseth2020-10-025-197/+125
|\ \ \ \ \
| * | | | | Update commentJon Bratseth2020-10-021-2/+2
| * | | | | Don't reactivate on retired hostsJon Bratseth2020-10-025-197/+125
| |/ / / /
* | | | | Merge pull request #14677 from vespa-engine/toregge/enable-mbus-feeding-for-v...Henning Baldersheim2020-10-0217-83/+677
|\ \ \ \ \
| * | | | | Don't name unused arguments.Tor Egge2020-10-021-9/+3
| * | | | | Use default destructor.Tor Egge2020-10-021-3/+1
| * | | | | Enable feeding over message bus for vespa-feed-bm.Tor Egge2020-10-0217-83/+685
| |/ / / /