Merge branch '1.6' into 1.7
Conflicts:
test/system/continuous/run-verify.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1bc1dd8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1bc1dd8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1bc1dd8
Branch: refs/heads/1.7
Commit: f1bc1dd8dbf73e0063aa7e1daf577c953a9a63e0
Parents: a0032a9 e785da1
Author: Josh Elser <els...@apache.org>
Authored: Tue Jun 23 22:50:29 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Tue Jun 23 22:50:29 2015 -0400
----------------------------------------------------------------------
test/system/continuous/run-verify.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1bc1dd8/test/system/continuous/run-verify.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/run-verify.sh
index 4706d6b,42eb214..c68c3ea
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@@ -27,12 -27,16 +27,12 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
script=$( basename "${SOURCE}" )
# Stop: Resolve Script Directory
-. ${bin}/mapred-setup.sh
+. "${bin}/mapred-setup.sh"
AUTH_OPT="";
+[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS"
-if [ -n "$VERIFY_AUTHS" ] ; then
- AUTH_OPT="--auths $VERIFY_AUTHS";
-fi
SCAN_OPT=--offline
-if [ "$SCAN_OFFLINE" == "false" ] ; then
- SCAN_OPT=
-fi
+[[ $SCAN_OFFLINE == false ]] && SCAN_OPT=
- "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR"
org.apache.accumulo.test.continuous.ContinuousVerify -libjars "$SERVER_LIBJAR"
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers
"$VERIFY_REDUCERS" "$SCAN_OPT"
-$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR"
org.apache.accumulo.test.continuous.ContinuousVerify
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR"
$AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE
--output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS
$SCAN_OPT
++"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR"
org.apache.accumulo.test.continuous.ContinuousVerify
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR"
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers
"$VERIFY_REDUCERS" "$SCAN_OPT"
