diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 00:47:13 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 00:47:13 +0100 |
| commit | 49b6e85963ef55fb6cfa1876fe825730f95658bc (patch) | |
| tree | b3f5c605d64c984a092a34c32b34305d4a3d687a /test/scripts/continuous-merge-start.sh | |
| parent | 19a2a611a839c0318f58347e2d93943c8e2401a5 (diff) | |
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.
Diffstat (limited to 'test/scripts/continuous-merge-start.sh')
| -rwxr-xr-x | test/scripts/continuous-merge-start.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |