date:20140127

[02/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

2014-01-27 Thread elserj

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cabe14a1

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: cabe14a15dfc34e78b086a639eb1ccc2334ced3a
Parents: 6593a9f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 14:59:25 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 14:59:25 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/cabe14a1/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh 
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index b0c79b5..b72c773 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh 
b/conf/examples/1GB/standalone/accumulo-env.sh
index eac752c..2786775 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/2GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh 
b/conf/examples/2GB/native-standalone/accumulo-env.sh
index 18694c2..2a4e611 100755
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@ -50,7 +50,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx2
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75

[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-27 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f67603f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f67603f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f67603f9

Branch: refs/heads/master
Commit: f67603f9c97d2a81f1c5f2b9e778adb92c41c1da
Parents: 19da920 44ff6b0
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 15:01:48 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 15:01:48 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/f67603f9/conf/examples/1GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/1GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/2GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/2GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/3GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/3GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/512MB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/512MB/standalone/accumulo-env.sh
--

[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-27 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f67603f9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f67603f9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f67603f9

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f67603f9c97d2a81f1c5f2b9e778adb92c41c1da
Parents: 19da920 44ff6b0
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 15:01:48 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 15:01:48 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/f67603f9/conf/examples/1GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/1GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/2GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/2GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/3GB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/3GB/standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/512MB/native-standalone/accumulo-env.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67603f9/conf/examples/512MB/standalone/accumulo-env.sh
--

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-27 Thread elserj

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/master
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_OPTSexport 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_OPTSexport 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

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-27 Thread elserj

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_OPTSexport 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_OPTSexport 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

[03/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

2014-01-27 Thread elserj

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cabe14a1

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: cabe14a15dfc34e78b086a639eb1ccc2334ced3a
Parents: 6593a9f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 14:59:25 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 14:59:25 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/cabe14a1/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh 
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index b0c79b5..b72c773 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh 
b/conf/examples/1GB/standalone/accumulo-env.sh
index eac752c..2786775 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/2GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh 
b/conf/examples/2GB/native-standalone/accumulo-env.sh
index 18694c2..2a4e611 100755
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@ -50,7 +50,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx2
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75

[04/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

2014-01-27 Thread elserj

ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cabe14a1

Branch: refs/heads/master
Commit: cabe14a15dfc34e78b086a639eb1ccc2334ced3a
Parents: 6593a9f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 14:59:25 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 14:59:25 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/cabe14a1/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh 
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index b0c79b5..b72c773 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh 
b/conf/examples/1GB/standalone/accumulo-env.sh
index eac752c..2786775 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/2GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh 
b/conf/examples/2GB/native-standalone/accumulo-env.sh
index 18694c2..2a4e611 100755
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@ -50,7 +50,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx2
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-27 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3132b012
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3132b012
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3132b012

Branch: refs/heads/master
Commit: 3132b0121f7cab6882c19b0f94a41dac154c1c95
Parents: 0524ddb f67603f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 15:02:09 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 15:02:09 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(-)
--

[01/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

2014-01-27 Thread elserj

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 6593a9f54 - cabe14a15
  refs/heads/1.5.1-SNAPSHOT 295643ab0 - 44ff6b0dd
  refs/heads/1.6.0-SNAPSHOT 19da920aa - f67603f9c
  refs/heads/master 0524ddbfb - 3132b0121


ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cabe14a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cabe14a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cabe14a1

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: cabe14a15dfc34e78b086a639eb1ccc2334ced3a
Parents: 6593a9f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 14:59:25 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 14:59:25 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/cabe14a1/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh 
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index b0c79b5..b72c773 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh 
b/conf/examples/1GB/standalone/accumulo-env.sh
index eac752c..2786775 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -51,7 +51,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx1
 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_GENERAL_OPTS  export 
ACCUMULO_GENERAL_OPTS=-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true
 test -z $ACCUMULO_OTHER_OPTSexport 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`
 # what do when the JVM runs out of heap memory

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cabe14a1/conf/examples/2GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh 
b/conf/examples/2GB/native-standalone/accumulo-env.sh
index 18694c2..2a4e611 100755
--- a/conf/examples/2GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/2GB/native-standalone/accumulo-env.sh
@@ -50,7 +50,7 @@ test -z $ACCUMULO_MASTER_OPTS   export 
ACCUMULO_MASTER_OPTS=${POLICY} -Xmx2
 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

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-27 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
test/system/auto/stress/restart.py


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bff86684
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bff86684
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bff86684

Branch: refs/heads/master
Commit: bff866845590cef8375d17d265127e34101d5dc2
Parents: f67603f ffd7232
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 23:03:05 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 23:03:05 2014 -0500

--

--

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-27 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1bcc62af
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bcc62af
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1bcc62af

Branch: refs/heads/master
Commit: 1bcc62af3a7cfc7bdd3af56c6ead24f64d915585
Parents: 3132b01 bff8668
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 23:03:14 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 23:03:14 2014 -0500

--

--

[2/6] git commit: ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2

2014-01-27 Thread elserj

ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffd72325
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffd72325
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffd72325

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ffd72325e5dd4ed3a6a46ba6ef47f95f87c7c40a
Parents: 44ff6b0
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 21:11:20 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 21:11:20 2014 -0500

--
 test/system/auto/stress/restart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffd72325/test/system/auto/stress/restart.py
--
diff --git a/test/system/auto/stress/restart.py 
b/test/system/auto/stress/restart.py
index 4e7f66c..86d5d7e 100755
--- a/test/system/auto/stress/restart.py
+++ b/test/system/auto/stress/restart.py
@@ -104,7 +104,7 @@ class KilledTabletServerSplitTest(KilledTabletServerTest):
 settings.update({
 'tserver.memory.maps.max':'5K',
 'tserver.compaction.major.delay': 1,
-'tserver.walog.max.size': '50K',
+'tserver.walog.max.size': '2M',
 })
 
 def ingest(self, host, count, start=0, timestamp=None, size=50, colf=None, 
**kwargs):

[02/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[03/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

[04/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

[01/10] git commit: ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

[2/6] git commit: ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2

12 matches

Site Navigation

Mail list logo

Footer information