Repository: accumulo Updated Branches: refs/heads/1.6 1f2556b1d -> b68bdaea4 refs/heads/master a779f172e -> e912cdde0
ACCUMULO-3338 Replace "End Hadoop2 requirements" and fix broken bootstrap_config.sh bootstrap_config.sh (unintuitively) needs the matching end comments to do its sed replacement. However, said replacement introduced an extra 'n' character in an attempt to insert a newline for hadoop 1 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/040e2678 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/040e2678 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/040e2678 Branch: refs/heads/1.6 Commit: 040e267830bcb815a4d195f38320964328212a98 Parents: 1f2556b Author: Josh Elser <els...@apache.org> Authored: Sun Nov 16 12:16:10 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Nov 16 12:16:10 2014 -0500 ---------------------------------------------------------------------- assemble/bin/bootstrap_config.sh | 4 ++-- assemble/conf/templates/accumulo-site.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/040e2678/assemble/bin/bootstrap_config.sh ---------------------------------------------------------------------- diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh index fd262f0..81139a7 100755 --- a/assemble/bin/bootstrap_config.sh +++ b/assemble/bin/bootstrap_config.sh @@ -296,8 +296,8 @@ sed -e "s/\${memMapMax}/${!MEMORY_MAP_MAX}/" \ 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/<!-- 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 fi http://git-wip-us.apache.org/repos/asf/accumulo/blob/040e2678/assemble/conf/templates/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml index 409843a..a59e4a5 100644 --- a/assemble/conf/templates/accumulo-site.xml +++ b/assemble/conf/templates/accumulo-site.xml @@ -121,6 +121,7 @@ ${mvnProjBaseDir} /usr/hdp/current/hadoop-mapreduce-client/[^.].*.jar, /usr/hdp/current/hadoop-yarn-client/[^.].*.jar, /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar, + <!-- End Hadoop 2 requirements --> /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar <!-- Hadoop 1 requirements --> $HADOOP_PREFIX/[^.].*.jar,
