You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/09/10 11:07:13 UTC

bigtop git commit: BIGTOP-1805: Upgrade Hadoop to 2.7 if released

Repository: bigtop
Updated Branches:
  refs/heads/master 96a2a4aca -> db3e38a78


BIGTOP-1805: Upgrade Hadoop to 2.7 if released

Updates to Hadoop 2.7.1 and removes workaround BIGTOP-1893


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

Branch: refs/heads/master
Commit: db3e38a78d854e11a51ef2f5dfa3049971010d76
Parents: 96a2a4a
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Thu Aug 20 22:08:52 2015 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Thu Sep 10 10:58:41 2015 +0200

----------------------------------------------------------------------
 bigtop-packages/src/common/hadoop/patch01-testcli.diff | 10 ----------
 bigtop.mk                                              |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/db3e38a7/bigtop-packages/src/common/hadoop/patch01-testcli.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/patch01-testcli.diff b/bigtop-packages/src/common/hadoop/patch01-testcli.diff
deleted file mode 100644
index 133a0bd..0000000
--- a/bigtop-packages/src/common/hadoop/patch01-testcli.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- hadoop-2.6.0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java_old	2015-06-11 17:20:03.938969909 +0200
-+++ hadoop-2.6.0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java	2015-06-11 17:20:14.066968963 +0200
-@@ -67,7 +67,6 @@
- import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
- import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager;
- import org.apache.hadoop.yarn.util.Records;
--import org.jboss.netty.logging.CommonsLoggerFactory;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/bigtop/blob/db3e38a7/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 9f823f0..19eb2f6 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -40,8 +40,8 @@ $(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
 # Hadoop 0.20.0-based hadoop package
 HADOOP_NAME=hadoop
 HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=2.6.0
-HADOOP_PKG_VERSION=2.6.0
+HADOOP_BASE_VERSION=2.7.1
+HADOOP_PKG_VERSION=2.7.1
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
 HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz