Repository: accumulo Updated Branches: refs/heads/master c3f596ead -> 664012d16
ACCUMULO-4116 fix bad merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd9969f1 Branch: refs/heads/master Commit: bd9969f1d14a0b719cd8454413231ab33d3b9a12 Parents: 9036325 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Jan 27 11:36:46 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Jan 27 11:36:46 2016 -0500 ---------------------------------------------------------------------- test/system/continuous/run-moru.sh | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd9969f1/test/system/continuous/run-moru.sh ---------------------------------------------------------------------- diff --git a/test/system/continuous/run-moru.sh b/test/system/continuous/run-moru.sh index 9824f67..eb4403d 100755 --- a/test/system/continuous/run-moru.sh +++ b/test/system/continuous/run-moru.sh @@ -27,15 +27,11 @@ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd ) script=$( basename "${SOURCE}" ) # Stop: Resolve Script Directory -<<<<<<< HEAD -. "${bin}/mapred-setup.sh" -======= CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}} . $CONTINUOUS_CONF_DIR/continuous-env.sh . $ACCUMULO_CONF_DIR/accumulo-env.sh SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar" ->>>>>>> 1.6 "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min "$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory "$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" --maxMappers "$VERIFY_MAX_MAPS"
