summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-08-31 20:56:59 +0200
committerLinus Nordberg <linus@nordu.net>2017-08-31 20:56:59 +0200
commitc85d1a96bcdcfec34b597392472125e2bf41b541 (patch)
treeb97aa6facd111274b860ce000c051b72b9e4abc1
parent15f593cbc1dd55435ac7d8dc5e0a63d4e32d29aa (diff)
Remove spurious MERGE_DB_DIR setting.
The same thing is done in merge.sh.
-rwxr-xr-xcatlfish-dev/start.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/catlfish-dev/start.sh b/catlfish-dev/start.sh
index e651fae..8b3d04a 100755
--- a/catlfish-dev/start.sh
+++ b/catlfish-dev/start.sh
@@ -26,7 +26,6 @@ case $role in
;;
merge)
- [ -z "${MERGE_DB_DIR}" ] && MERGE_DB_DIR=merge-db
$erlbase/merge.sh ${logname} ${nodename} \
> merge_log/stdout \
2> merge_log/stderr &