accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [09/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Thu, 07 Nov 2013 18:51:49 GMT
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 <eric.newton@gmail.com>
Authored: Thu Nov 7 13:51:29 2013 -0500
Committer: Eric Newton <eric.newton@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


Mime
View raw message