summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into revert-20366-revert-20350-hmusum/config-subscripti...Harald Musum2021-12-1249-67/+110
|\
| * Merge pull request #20474 from vespa-engine/hmusum/synchronize-access-to-subs...Henning Baldersheim2021-12-111-13/+23
| |\
| | * Synchronize access to subscribers mapHarald Musum2021-12-111-13/+23
| * | Merge pull request #20473 from vespa-engine/toregge/use-md5-instead-of-md5sum...Henning Baldersheim2021-12-111-1/+6
| |\ \
| | * | Use md5 command instead of md5sum on darwin.Tor Egge2021-12-111-1/+6
| * | | Merge pull request #20472 from vespa-engine/toregge/no-numactl-on-darwinHenning Baldersheim2021-12-111-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Darwin does not have numactl command.Tor Egge2021-12-111-0/+4
| |/ /
| * | Merge pull request #20471 from vespa-engine/toregge/include-string-header-fileHenning Baldersheim2021-12-111-1/+1
| |\ \
| | * | Include string header file when needed.Tor Egge2021-12-111-1/+1
| * | | Merge pull request #20463 from vespa-engine/toregge/include-signal-header-fileHenning Baldersheim2021-12-111-0/+1
| |\ \ \
| | * | | Include csignal instead of signal.hTor Egge2021-12-111-1/+1
| | * | | Include signal.h to get declarations of kill() and killpg() on Darwin.Tor Egge2021-12-111-0/+1
| | |/ /
| * | | Merge pull request #20470 from vespa-engine/toregge/backport-to-gcc-9-no-rangesHenning Baldersheim2021-12-111-3/+6
| |\ \ \
| | * | | gcc 9 does not support std::ranges::all_of.Tor Egge2021-12-111-3/+6
| | |/ /
| * | | Merge pull request #20469 from vespa-engine/toregge/backport-to-gcc-9-no-defa...Henning Baldersheim2021-12-111-1/+3
| |\ \ \
| | * | | gcc 9 has no default operator==.Tor Egge2021-12-111-1/+3
| | |/ /
| * | | Merge pull request #20468 from vespa-engine/toregge/declare-noexcept-move-con...Henning Baldersheim2021-12-112-0/+4
| |\ \ \
| | * | | Declare noexcept move constructor and assignment for storage::spi::Result.Tor Egge2021-12-112-0/+4
| | |/ /
| * | | Merge pull request #20467 from vespa-engine/toregge/backport-to-gcc-9-use-nor...Henning Baldersheim2021-12-111-6/+12
| |\ \ \
| | * | | Use normal function template instead of abbreviated function template.Tor Egge2021-12-111-6/+12
| | |/ /
| * | | Merge pull request #20466 from vespa-engine/toregge/deinline-serialized-chunk...Henning Baldersheim2021-12-112-0/+4
| |\ \ \
| | * | | Deinline SerializedChunk destructor.Tor Egge2021-12-112-0/+4
| | |/ /
| * | | Merge pull request #20465 from vespa-engine/toregge/include-atomic-when-neededHenning Baldersheim2021-12-112-0/+2
| |\ \ \
| | * | | Include atomic when needed.Tor Egge2021-12-112-0/+2
| | |/ /
| * | | Merge pull request #20464 from vespa-engine/toregge/fix-format-stringHenning Baldersheim2021-12-111-2/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix format string (Use PRId64 macro when argument type is int64_t).Tor Egge2021-12-111-2/+3
| |/ /
| * | Merge pull request #20462 from vespa-engine/toregge/add-noexcept-specifiersHenning Baldersheim2021-12-1134-40/+40
| |\ \ | | |/ | |/|
| | * Add noexcept specifiers.Tor Egge2021-12-1134-40/+40
| |/
* | Merge branch 'master' into revert-20366-revert-20350-hmusum/config-subscripti...Harald Musum2021-12-11458-4054/+6209
|\|
| * Merge pull request #20461 from vespa-engine/balder/retry-lidoperation-until-s...Henning Baldersheim2021-12-109-31/+24
| |\
| | * Before deciding if it is necessary to restart the scan we must wait until all...Henning Baldersheim2021-12-101-2/+7
| | * Unblock the last pending document.Henning Baldersheim2021-12-101-0/+1
| | * Remove retry parameter not in use anymore.Henning Baldersheim2021-12-108-30/+17
| |/
| * Merge pull request #20459 from vespa-engine/balder/refactor-operation-countingHenning Baldersheim2021-12-104-30/+63
| |\
| | * Move operation counting out to separate classHenning Baldersheim2021-12-104-30/+63
| * | Merge pull request #20460 from vespa-engine/revert-20437-arnej/produce-new-do...Arnstein Ressem2021-12-103-313/+8
| |\ \ | | |/ | |/|
| | * Revert "Arnej/produce new doctypes config"Arne H Juul2021-12-103-313/+8
| |/
| * Merge pull request #20458 from vespa-engine/revert-20453-revert-20448-hmusum/...Henning Baldersheim2021-12-1014-182/+171
| |\
| | * Make sure to keep memory cache when switching modeHarald Musum2021-12-103-4/+4
| | * Revert "Revert "Hmusum/refactor config proxy [run-systemtest]""Harald Musum2021-12-1014-184/+173
| |/
| * Merge pull request #20457 from vespa-engine/balder/commit-after-every-delete-...Henning Baldersheim2021-12-102-2/+1
| |\
| | * Trigger commit from feedhandler insteda of only in AttributeWriter.Henning Baldersheim2021-12-102-2/+1
| * | Merge pull request #20455 from vespa-engine/hmusum/minor-changesHenning Baldersheim2021-12-101-6/+5
| |\ \ | | |/ | |/|
| | * Make sure to always delete temp file/dirHarald Musum2021-12-101-6/+5
| * | Merge pull request #20452 from vespa-engine/balder/let-accounting-handle-mult...Henning Baldersheim2021-12-102-15/+27
| |\ \
| | * | Let accounting handle multiple commits in flight.Henning Baldersheim2021-12-102-15/+27
| * | | Merge pull request #20456 from vespa-engine/revert-20439-bratseth/zoneinfo-in...Henning Baldersheim2021-12-1015-235/+45
| |\ \ \
| | * | | Revert "Add zone info to query profile context"Arnstein Ressem2021-12-1015-235/+45
| |/ / /
| * | | Merge pull request #20454 from vespa-engine/arnej/remove-old-logs-more-oftenHenning Baldersheim2021-12-101-1/+6
| |\ \ \ | | |_|/ | |/| |
| | * | check more often if we should remove old logsArne H Juul2021-12-101-1/+6
| |/ /