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/e912cdde
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e912cdde
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e912cdde
Branch: refs/heads/master
Commit: e912cdde0ea9e0f55fdd9a47bedefa958fd70d0e
Parents: a779f17 b68bdae
Author: Josh Elser <elserj@apache.org>
Authored: Sun Nov 16 12:20:43 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Nov 16 12:20:43 2014 -0500
----------------------------------------------------------------------
assemble/bin/bootstrap_config.sh | 10 +++++-----
assemble/conf/templates/accumulo-site.xml | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e912cdde/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------
diff --cc assemble/bin/bootstrap_config.sh
index 2c8c592,8b18757..681924f
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@@ -294,12 -294,12 +294,12 @@@ 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 -->\n
<!--/' \
- -e 's/<!-- End Hadoop 2 requirements -->/-->\n <!-- End Hadoop 2
requirements -->/' \
+ 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"
fi
#Additional setup steps for native configuration.
|