accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.6'
Date Tue, 18 Nov 2014 17:27:30 GMT
Merge branch '1.6'

Conflicts:
	assemble/bin/bootstrap_config.sh


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

Branch: refs/heads/master
Commit: a711ae97f7924e65303702019ceac5a75f4a0a1b
Parents: 60e0b40 7ccae95
Author: Josh Elser <elserj@apache.org>
Authored: Tue Nov 18 12:21:43 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Nov 18 12:21:43 2014 -0500

----------------------------------------------------------------------
 assemble/bin/bootstrap_config.sh          | 61 +++++++++++++++++++++++---
 assemble/conf/templates/accumulo-site.xml |  7 ++-
 2 files changed, 62 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a711ae97/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------
diff --cc assemble/bin/bootstrap_config.sh
index 681924f,42b83ad..bc94a34
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@@ -294,12 -298,59 +298,59 @@@ sed -e "s/\${memMapMax}/${!MEMORY_MAP_M
  
  #Configure for hadoop 1
  if [[ "$HADOOP_VERSION" = "1" ]]; then
 -  sed -e 's/^test -z \"$HADOOP_CONF_DIR\"/#test -z \"$HADOOP_CONF_DIR\"/' -e 's/^# test
-z "$HADOOP_CONF_DIR"/test -z \"$HADOOP_CONF_DIR\"/' ${CONF_DIR}/$ACCUMULO_ENV > temp
 -  mv temp ${CONF_DIR}/$ACCUMULO_ENV
 +  sed -e 's/^test -z \"$HADOOP_CONF_DIR\"/#test -z \"$HADOOP_CONF_DIR\"/' -e 's/^# test
-z "$HADOOP_CONF_DIR"/test -z \"$HADOOP_CONF_DIR\"/' "${CONF_DIR}/$ACCUMULO_ENV" > temp
 +  mv temp "${CONF_DIR}/$ACCUMULO_ENV"
    sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/'
\
        -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
 +      "${CONF_DIR}/$ACCUMULO_SITE" > temp
 +  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.2 requirements -->/<!-- HDP 2.2 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+ elif [[ "${HADOOP_VERSION}" == "2" ]]; then
+   sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/'
\
+       -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.2 requirements -->/<!-- HDP 2.2 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+ elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then
+   sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/'
\
+       -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/'
\
+       -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.2 requirements -->/<!-- HDP 2.2 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+ elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then
+   sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/'
\
+       -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/'
\
+       -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+   sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/'
\
+       -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements
-->/' \
 -      ${CONF_DIR}/$ACCUMULO_SITE > temp
 -  mv temp  ${CONF_DIR}/$ACCUMULO_SITE
++      "${CONF_DIR}/$ACCUMULO_SITE" > temp
++  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
  fi
  
  #Additional setup steps for native configuration.


Mime
View raw message