accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [2/2] accumulo git commit: Merge branch '1.6' into 1.7
Date Tue, 16 Aug 2016 17:22:09 GMT
Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 8aaef9e7a863f0348b922d31826f27bdbcfe9551
Parents: 1e087ba 02ac592
Author: Dave Marion <dlmarion@apache.org>
Authored: Tue Aug 16 13:02:20 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Tue Aug 16 13:02:20 2016 -0400

----------------------------------------------------------------------
 assemble/bin/bootstrap_config.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8aaef9e7/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------
diff --cc assemble/bin/bootstrap_config.sh
index 719aff9,ba695d5..9dfa6b8
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@@ -381,17 -354,17 +381,17 @@@ elif [[ "${HADOOP_VERSION}" == "IOP4.1
  fi
  
  #Additional setup steps for native configuration.
 -if [[ "${TYPE}" = "native" ]]; then
 -  if [[ "$(uname)" = 'Linux' ]]; then
 +if [[ ${TYPE} == native ]]; then
 +  if [[ $(uname) == Linux ]]; then
      if [[ -z $HADOOP_PREFIX ]]; then
-       echo "HADOOP_PREFIX not set cannot automatically configure LD_LIBRARY_PATH"
+       echo "WARNING: HADOOP_PREFIX not set, cannot automatically configure LD_LIBRARY_PATH
to include Hadoop native libraries"
      else
        NATIVE_LIB=$(readlink -ef $(dirname $(for x in $(find $HADOOP_PREFIX -name libhadoop.so);
do ld $x 2>/dev/null && echo $x && break; done) 2>>/dev/null) 2>>/dev/null)
        if [[ -z $NATIVE_LIB ]]; then
-         echo -e "Native libraries could not be found for your sytem in: $HADOOP_PREFIX"
+         echo -e "WARNING: The Hadoop native libraries could not be found for your sytem
in: $HADOOP_PREFIX"
        else
          sed "/# Should the monitor/ i export LD_LIBRARY_PATH=${NATIVE_LIB}:\${LD_LIBRARY_PATH}"
${CONF_DIR}/$ACCUMULO_ENV > temp
 -        mv temp ${CONF_DIR}/$ACCUMULO_ENV
 +        mv temp "${CONF_DIR}/$ACCUMULO_ENV"
          echo -e "Added ${NATIVE_LIB} to the LD_LIBRARY_PATH"
        fi
      fi


Mime
View raw message