From 49b6e85963ef55fb6cfa1876fe825730f95658bc Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 25 Nov 2016 00:47:13 +0100 Subject: Parallelise merge_fetch.py. NOTE: Not supporting permdb yet! We're still not passing the tests because merge_backup.py exits when the secondary merge disappears. --- test/scripts/continuous-merge-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/scripts/continuous-merge-start.sh') diff --git a/test/scripts/continuous-merge-start.sh b/test/scripts/continuous-merge-start.sh index 666512f..5791d12 100755 --- a/test/scripts/continuous-merge-start.sh +++ b/test/scripts/continuous-merge-start.sh @@ -7,4 +7,4 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd) . ${top_srcdir}/test/scripts/testutils.sh -do_merge --mergeinterval 30 --pidfile merge.pid +do_merge --mergeinterval 10 --pidfile merge.pid -- cgit v1.1