bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject bigtop git commit: BIGTOP-1893: Compilation of hadoop-yarn-client failed
Date Thu, 18 Jun 2015 15:14:53 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master e874ac713 -> 8bd519cd1


BIGTOP-1893: Compilation of hadoop-yarn-client failed

Signed-off-by: Evans Ye <evansye@apache.org>


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

Branch: refs/heads/master
Commit: 8bd519cd1c2979980ac36ce62b03d62a104b3fdd
Parents: e874ac7
Author: Olaf Flebbe <of@oflebbe.de>
Authored: Sun Jun 14 18:45:50 2015 +0200
Committer: Evans Ye <evansye@apache.org>
Committed: Thu Jun 18 15:14:31 2015 +0000

----------------------------------------------------------------------
 bigtop-packages/src/common/hadoop/patch01-testcli.diff | 10 ++++++++++
 bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec       |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/8bd519cd/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
new file mode 100644
index 0000000..133a0bd
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch01-testcli.diff
@@ -0,0 +1,10 @@
+--- 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/8bd519cd/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 4a6cfaf..4e977e4 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -169,6 +169,7 @@ Source26: yarn.1
 Source27: hdfs.1
 Source28: mapred.1
 Source29: hadoop-yarn-timelineserver.svc
+#BIGTOP_PATCH_FILES
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 BuildRequires: fuse-devel, fuse, cmake
 Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
bigtop-utils >= 0.7, zookeeper >= 3.4.0
@@ -460,7 +461,7 @@ These projects (enumerated below) allow HDFS to be mounted (on most flavors
of U
 %prep
 %setup -n %{name}-%{hadoop_base_version}-src
 
-
+#BIGTOP_PATCH_COMMANDS
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME
 # This assumes that you installed Forrest and set FORREST_HOME


Mime
View raw message