accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Sat, 21 Dec 2013 00:28:33 GMT
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/0d58654e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d58654e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d58654e

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0d58654e7e05d2a8c56eae5629d47762f4396491
Parents: 9cfdb3c 55827af
Author: Josh Elser <elserj@apache.org>
Authored: Fri Dec 20 19:27:52 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Dec 20 19:27:52 2013 -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/0d58654e/conf/examples/1GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-env.sh
index c683521,b0c79b5..28936d0
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/1GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-env.sh
index 6fe9cf9,eac752c..a0e9517
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx384m -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/2GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-env.sh
index bbad995,18694c2..1c9965d
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/2GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-env.sh
index b9c14e0,ae5fffe..9c95ba7
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx768m -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx256m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/3GB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-env.sh
index a28892a,74308b0..710c82e
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/3GB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-env.sh
index 0c3672b,d75dda3..0df95e4
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx1g -Xms256m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx1g -Xms256m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/512MB/native-standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-env.sh
index 7f32213,cdd33e9..81728ac
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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/0d58654e/conf/examples/512MB/standalone/accumulo-env.sh
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-env.sh
index a4c95fc,ba0b0c1..40496df
--- 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_LOGGER_OPTS"  && export ACCUMULO_LOGGER_OPTS="-Xmx128m -Xms128m"
  test -z "$ACCUMULO_GENERAL_OPTS" && export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75"
  test -z "$ACCUMULO_OTHER_OPTS"   && export ACCUMULO_OTHER_OPTS="-Xmx128m -Xms64m"
- export ACCUMULO_LOG_HOST=`(grep -v '^#' $ACCUMULO_HOME/conf/monitor ; echo localhost ) 2>/dev/null
| head -1`
 -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"


Mime
View raw message