You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/11/07 19:51:41 UTC

[01/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 41efe1a7e -> 579c274c2
  refs/heads/1.5.1-SNAPSHOT 1096fbb9a -> 060188a74
  refs/heads/1.6.0-SNAPSHOT b0d056eeb -> 81861db9c
  refs/heads/master 0a0ab3250 -> ddde450b9


ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Signed-off-by: Eric Newton <er...@gmail.com>


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0
Parents: 41efe1a
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Wed Oct 23 16:46:14 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:50:45 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 9277406..162c2d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -25,6 +25,7 @@
 #  HADOOP_HOME        Home dir for hadoop.
 # 
 # Values always set by script.
+#  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
 #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons


[03/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Posted by ec...@apache.org.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Signed-off-by: Eric Newton <er...@gmail.com>


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0
Parents: 41efe1a
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Wed Oct 23 16:46:14 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:50:45 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 9277406..162c2d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -25,6 +25,7 @@
 #  HADOOP_HOME        Home dir for hadoop.
 # 
 # Values always set by script.
+#  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
 #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons


[13/14] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@apache.org.
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/81861db9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81861db9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81861db9

Branch: refs/heads/master
Commit: 81861db9ca39e6d9de37d7c05dc9304c0931e725
Parents: b0d056e 060188a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:43 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:43 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81861db9/bin/config.sh
----------------------------------------------------------------------


[09/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Posted by ec...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 060188a746311852c0c2544b0a3b5ba1bd868f99
Parents: 1096fbb 579c274
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:29 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/060188a7/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index 6c4d74a,2d9e6fe..5f560e3
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -22,31 +22,28 @@@
  #  ACCUMULO_HOME      Home directory for Accumulo
  #  ACCUMULO_LOG_DIR   Directory for Accumulo daemon logs
  #  ACCUMULO_VERSION   Accumulo version name
 -#  HADOOP_HOME        Home dir for hadoop.
 +#  HADOOP_PREFIX      Prefix to the home dir for hadoop.
  # 
  # Values always set by script.
- #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+ #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
+ #  GC                 Machine to run GC daemon on.  Used by start-here.sh script
  #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
  #  SSH                Default ssh parameters used to start daemons
 +#  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
  
 -this="$0"
 -while [ -h "$this" ]; do
 -    ls=`ls -ld "$this"`
 -    link=`expr "$ls" : '.*-> \(.*\)$'`
 -    if expr "$link" : '.*/.*' > /dev/null; then
 -        this="$link"
 -    else
 -        this=`dirname "$this"`/"$link"
 -    fi
 +# Start: Resolve Script Directory
 +SOURCE="${BASH_SOURCE[0]}"
 +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
 +   bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +   SOURCE="$(readlink "$SOURCE")"
 +   [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
  done
 -bin=`dirname "$this"`
 -script=`basename "$this"`
 -bin=`cd "$bin"; pwd`
 -this="$bin/$script"
 +bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +script=$( basename "$SOURCE" )
 +# Stop: Resolve Script Directory
  
 -ACCUMULO_HOME=`dirname "$this"`/..
 -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
 +ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
 +export ACCUMULO_HOME
  
  ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
  export ACCUMULO_CONF_DIR


[07/14] git commit: ACCUMULO-1810 fix typo in comment

Posted by ec...@apache.org.
ACCUMULO-1810 fix typo in comment


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9
Parents: 0657a3a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:10 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:10 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 162c2d5..2d9e6fe 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,7 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 


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

Posted by ec...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 060188a746311852c0c2544b0a3b5ba1bd868f99
Parents: 1096fbb 579c274
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:29 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/060188a7/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index 6c4d74a,2d9e6fe..5f560e3
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -22,31 +22,28 @@@
  #  ACCUMULO_HOME      Home directory for Accumulo
  #  ACCUMULO_LOG_DIR   Directory for Accumulo daemon logs
  #  ACCUMULO_VERSION   Accumulo version name
 -#  HADOOP_HOME        Home dir for hadoop.
 +#  HADOOP_PREFIX      Prefix to the home dir for hadoop.
  # 
  # Values always set by script.
- #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+ #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
+ #  GC                 Machine to run GC daemon on.  Used by start-here.sh script
  #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
  #  SSH                Default ssh parameters used to start daemons
 +#  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
  
 -this="$0"
 -while [ -h "$this" ]; do
 -    ls=`ls -ld "$this"`
 -    link=`expr "$ls" : '.*-> \(.*\)$'`
 -    if expr "$link" : '.*/.*' > /dev/null; then
 -        this="$link"
 -    else
 -        this=`dirname "$this"`/"$link"
 -    fi
 +# Start: Resolve Script Directory
 +SOURCE="${BASH_SOURCE[0]}"
 +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
 +   bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +   SOURCE="$(readlink "$SOURCE")"
 +   [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
  done
 -bin=`dirname "$this"`
 -script=`basename "$this"`
 -bin=`cd "$bin"; pwd`
 -this="$bin/$script"
 +bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +script=$( basename "$SOURCE" )
 +# Stop: Resolve Script Directory
  
 -ACCUMULO_HOME=`dirname "$this"`/..
 -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
 +ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
 +export ACCUMULO_HOME
  
  ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
  export ACCUMULO_CONF_DIR


[11/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Posted by ec...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: 060188a746311852c0c2544b0a3b5ba1bd868f99
Parents: 1096fbb 579c274
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:29 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/060188a7/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index 6c4d74a,2d9e6fe..5f560e3
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -22,31 +22,28 @@@
  #  ACCUMULO_HOME      Home directory for Accumulo
  #  ACCUMULO_LOG_DIR   Directory for Accumulo daemon logs
  #  ACCUMULO_VERSION   Accumulo version name
 -#  HADOOP_HOME        Home dir for hadoop.
 +#  HADOOP_PREFIX      Prefix to the home dir for hadoop.
  # 
  # Values always set by script.
- #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+ #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
+ #  GC                 Machine to run GC daemon on.  Used by start-here.sh script
  #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
  #  SSH                Default ssh parameters used to start daemons
 +#  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
  
 -this="$0"
 -while [ -h "$this" ]; do
 -    ls=`ls -ld "$this"`
 -    link=`expr "$ls" : '.*-> \(.*\)$'`
 -    if expr "$link" : '.*/.*' > /dev/null; then
 -        this="$link"
 -    else
 -        this=`dirname "$this"`/"$link"
 -    fi
 +# Start: Resolve Script Directory
 +SOURCE="${BASH_SOURCE[0]}"
 +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
 +   bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +   SOURCE="$(readlink "$SOURCE")"
 +   [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
  done
 -bin=`dirname "$this"`
 -script=`basename "$this"`
 -bin=`cd "$bin"; pwd`
 -this="$bin/$script"
 +bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 +script=$( basename "$SOURCE" )
 +# Stop: Resolve Script Directory
  
 -ACCUMULO_HOME=`dirname "$this"`/..
 -export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
 +ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
 +export ACCUMULO_HOME
  
  ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
  export ACCUMULO_CONF_DIR


[02/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Posted by ec...@apache.org.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Signed-off-by: Eric Newton <er...@gmail.com>


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

Branch: refs/heads/master
Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0
Parents: 41efe1a
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Wed Oct 23 16:46:14 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:50:45 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 9277406..162c2d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -25,6 +25,7 @@
 #  HADOOP_HOME        Home dir for hadoop.
 # 
 # Values always set by script.
+#  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
 #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons


[04/14] git commit: ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Posted by ec...@apache.org.
ACCUMULO-1810 add MALLOC_ARENA_MAX to docs on published ENV.

Signed-off-by: Eric Newton <er...@gmail.com>


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0657a3aaa054d001fcafceea98a9c22d06145cb0
Parents: 41efe1a
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Wed Oct 23 16:46:14 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:50:45 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0657a3aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 9277406..162c2d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -25,6 +25,7 @@
 #  HADOOP_HOME        Home dir for hadoop.
 # 
 # Values always set by script.
+#  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
 #  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons


[06/14] git commit: ACCUMULO-1810 fix typo in comment

Posted by ec...@apache.org.
ACCUMULO-1810 fix typo in comment


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9
Parents: 0657a3a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:10 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:10 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 162c2d5..2d9e6fe 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,7 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 


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

Posted by ec...@apache.org.
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/ddde450b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ddde450b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ddde450b

Branch: refs/heads/master
Commit: ddde450b9b065fdf34bf0f1c775eeac409e1015a
Parents: 0a0ab32 81861db
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:53 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:53 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[05/14] git commit: ACCUMULO-1810 fix typo in comment

Posted by ec...@apache.org.
ACCUMULO-1810 fix typo in comment


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

Branch: refs/heads/master
Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9
Parents: 0657a3a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:10 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:10 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 162c2d5..2d9e6fe 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,7 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 


[08/14] git commit: ACCUMULO-1810 fix typo in comment

Posted by ec...@apache.org.
ACCUMULO-1810 fix typo in comment


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 579c274c2ef04ba19dc085787bf21c4564c0eff9
Parents: 0657a3a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:10 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:10 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/579c274c/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 162c2d5..2d9e6fe 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,7 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to rn GC daemon on.  Used by start-here.sh script
+#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 


[12/14] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@apache.org.
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/81861db9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81861db9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81861db9

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 81861db9ca39e6d9de37d7c05dc9304c0931e725
Parents: b0d056e 060188a
Author: Eric Newton <er...@gmail.com>
Authored: Thu Nov 7 13:51:43 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Nov 7 13:51:43 2013 -0500

----------------------------------------------------------------------
 bin/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81861db9/bin/config.sh
----------------------------------------------------------------------