Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh conf/examples/3GB/native-standalone/accumulo-env.sh conf/examples/3GB/standalone/accumulo-env.sh conf/examples/512MB/native-standalone/accumulo-env.sh conf/examples/512MB/standalone/accumulo-env.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44ff6b0d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44ff6b0d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44ff6b0d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 44ff6b0ddce64908ce0d68969b3f85702d5e73f1 Parents: 295643a cabe14a Author: Josh Elser <els...@apache.org> Authored: Mon Jan 27 15:01:33 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 27 15:01:33 2014 -0500 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/1GB/standalone/accumulo-env.sh | 2 +- conf/examples/2GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/2GB/standalone/accumulo-env.sh | 2 +- conf/examples/3GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/3GB/standalone/accumulo-env.sh | 2 +- conf/examples/512MB/native-standalone/accumulo-env.sh | 2 +- conf/examples/512MB/standalone/accumulo-env.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/1GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/1GB/native-standalone/accumulo-env.sh index 28936d0,b72c773..aa4a1d0 --- a/conf/examples/1GB/native-standalone/accumulo-env.sh +++ b/conf/examples/1GB/native-standalone/accumulo-env.sh @@@ -50,11 -50,9 +50,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/1GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/1GB/standalone/accumulo-env.sh index a0e9517,2786775..1707f3d --- a/conf/examples/1GB/standalone/accumulo-env.sh +++ b/conf/examples/1GB/standalone/accumulo-env.sh @@@ -50,11 -50,9 +50,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/2GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/2GB/native-standalone/accumulo-env.sh index 1c9965d,2a4e611..ef74ca7 --- a/conf/examples/2GB/native-standalone/accumulo-env.sh +++ b/conf/examples/2GB/native-standalone/accumulo-env.sh @@@ -49,11 -49,9 +49,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx256m -Xms256m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx128m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx128m -Xms128m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/2GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/2GB/standalone/accumulo-env.sh index 9c95ba7,3320447..75014c2 --- a/conf/examples/2GB/standalone/accumulo-env.sh +++ b/conf/examples/2GB/standalone/accumulo-env.sh @@@ -50,11 -50,9 +50,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx256m -Xms256m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx128m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx128m -Xms128m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/3GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/3GB/native-standalone/accumulo-env.sh index 710c82e,8910874..ae0da11 --- a/conf/examples/3GB/native-standalone/accumulo-env.sh +++ b/conf/examples/3GB/native-standalone/accumulo-env.sh @@@ -49,11 -49,9 +49,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx1g -Xms1g" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx1g -Xms256m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx256m -Xms256m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/3GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/3GB/standalone/accumulo-env.sh index 0df95e4,eb89c20..7edd938 --- a/conf/examples/3GB/standalone/accumulo-env.sh +++ b/conf/examples/3GB/standalone/accumulo-env.sh @@@ -49,11 -49,9 +49,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx1g -Xms1g" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx1g -Xms256m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx256m -Xms256m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/512MB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/512MB/native-standalone/accumulo-env.sh index 81728ac,d753255..749a678 --- a/conf/examples/512MB/native-standalone/accumulo-env.sh +++ b/conf/examples/512MB/native-standalone/accumulo-env.sh @@@ -49,11 -49,9 +49,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true" http://git-wip-us.apache.org/repos/asf/accumulo/blob/44ff6b0d/conf/examples/512MB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --cc conf/examples/512MB/standalone/accumulo-env.sh index 40496df,dfa310a..9beb059 --- a/conf/examples/512MB/standalone/accumulo-env.sh +++ b/conf/examples/512MB/standalone/accumulo-env.sh @@@ -49,11 -49,9 +49,11 @@@ test -z "$ACCUMULO_TSERVER_OPTS" && exp test -z "$ACCUMULO_MASTER_OPTS" && export ACCUMULO_MASTER_OPTS="${POLICY} -Xmx128m -Xms128m" test -z "$ACCUMULO_MONITOR_OPTS" && export ACCUMULO_MONITOR_OPTS="${POLICY} -Xmx64m -Xms64m" test -z "$ACCUMULO_GC_OPTS" && export ACCUMULO_GC_OPTS="-Xmx64m -Xms64m" - test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75" -test -z "$ACCUMULO_LOGGER_OPTS" && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m" + test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true" test -z "$ACCUMULO_OTHER_OPTS" && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m" -export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_CONF_DIR/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` +export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor | egrep -v '^[[:space:]]*$' ; echo localhost ) 2>/dev/null | head -1` # what do when the JVM runs out of heap memory export ACCUMULO_KILL_CMD='kill -9 %p' + +# Should the monitor bind to all network interfaces -- default: false +# export ACCUMULO_MONITOR_BIND_ALL="true"