You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/03/28 18:40:21 UTC
[3/3] git commit: BIGTOP-878. Bump version of Oozie to 3.3.1
BIGTOP-878. Bump version of Oozie to 3.3.1
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/569554fc
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/569554fc
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/569554fc
Branch: refs/heads/master
Commit: 569554fc5c57e0a8ba19bd0882d27e6980d1f751
Parents: 44b25ed
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Mon Mar 25 09:11:18 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu Mar 28 10:38:57 2013 -0700
----------------------------------------------------------------------
.../modules/hadoop-oozie/templates/oozie-site.xml | 6 ------
bigtop-packages/src/common/oozie/install_oozie.sh | 3 ---
bigtop.mk | 4 ++--
3 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/569554fc/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml b/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
index 3fdcf95..0e0a852 100644
--- a/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
@@ -23,12 +23,6 @@
Oozie configuration properties and their default values.
-->
- <!-- FIXME: OOZIE-1089, MAPREDUCE-4820 -->
- <property>
- <name>oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache</name>
- <value>true</value>
- </property>
-
<property>
<name>oozie.service.ActionService.executor.ext.classes</name>
<value>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/569554fc/bigtop-packages/src/common/oozie/install_oozie.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 6e3a284..5b260d6 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -160,9 +160,6 @@ install -d -m 0755 ${CONF_DIR}
cp -r ${BUILD_DIR}/conf/* ${CONF_DIR}
sed -i -e '/oozie.service.HadoopAccessorService.hadoop.configurations/,/<\/property>/s#<value>\*=hadoop-conf</value>#<value>*=/etc/hadoop/conf</value>#g' \
${CONF_DIR}/oozie-site.xml
-# FIXME: OOZIE-1089, MAPREDUCE-4820
-sed -i -e '/<\/configuration>/i<property><name>oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache</name><value>true</value></property>' \
- ${CONF_DIR}/oozie-site.xml
cp ${EXTRA_DIR}/oozie-env.sh ${CONF_DIR}
install -d -m 0755 ${CONF_DIR}/action-conf
cp ${EXTRA_DIR}/hive.xml ${CONF_DIR}/action-conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/569554fc/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index e92b46f..3fda56c 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -117,8 +117,8 @@ $(eval $(call PACKAGE,sqoop,SQOOP))
OOZIE_NAME=oozie
OOZIE_RELNOTES_NAME=Apache Oozie
OOZIE_PKG_NAME=oozie
-OOZIE_BASE_VERSION=3.3.0
-OOZIE_PKG_VERSION=3.3.0
+OOZIE_BASE_VERSION=3.3.1
+OOZIE_PKG_VERSION=3.3.1
OOZIE_RELEASE_VERSION=1
OOZIE_TARBALL_DST=oozie-$(OOZIE_BASE_VERSION).tar.gz
OOZIE_TARBALL_SRC=$(OOZIE_TARBALL_DST)