incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1240431 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-packages/src/common/hadoop/ bigtop-packages/src/deb/hadoop/ bigtop-packages/src/rpm/hadoop/SPECS/
Date Sat, 04 Feb 2012 01:26:57 GMT
Author: rvs
Date: Sat Feb  4 01:26:57 2012
New Revision: 1240431

URL: http://svn.apache.org/viewvc?rev=1240431&view=rev
Log:
BIGTOP-381. need to catch up with the HEAD of hadoop-common in hadoop-0.23

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop.mk

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch?rev=1240431&r1=1240430&r2=1240431&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
Sat Feb  4 01:26:57 2012
@@ -49,11 +49,11 @@ index 711dd18..c1da2fe 100644
        hsAddress, JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_PORT,
        JHAdminConfig.DEFAULT_MR_HISTORY_WEBAPP_ADDRESS);
 diff --git hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
-index 5d02250..140d93a 100644
+index 6681b1a..0f5fe82 100644
 --- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
 +++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
-@@ -1224,4 +1224,18 @@
-     mapreduce.job.end-notification.max.retry.interval</description>
+@@ -1255,4 +1255,18 @@
+     heartbeats to the ResourceManager</description>
  </property>
  
 +<!-- jobhistory properties -->

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch?rev=1240431&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch
(added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch
Sat Feb  4 01:26:57 2012
@@ -0,0 +1,13 @@
+diff --git hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+index ebaf899..0fb0615 100644
+--- hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
++++ hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+@@ -64,7 +64,7 @@
+             </goals>
+             <configuration>
+               <tasks>
+-                <copy file="src/main/resources/yarn-default.xml" todir="src/site/resources"/>
++                <copy file="../../hadoop-yarn-common/src/main/resources/yarn-default.xml"
todir="src/site/resources"/>
+                 <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
+               </tasks>
+             </configuration>

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1240431&r1=1240430&r2=1240431&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Sat Feb  4
01:26:57 2012
@@ -38,6 +38,8 @@ endif
 build: build-stamp
 build-stamp:
 	dh_testdir
+	patch -p0 < debian/MAPREDUCE-3436_rev2.patch
+	patch -p0 < debian/MAPREDUCE-3791.patch
 	env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
 		bash debian/do-component-build -Divy.home=${HOME}/.ivy2
 	touch $@

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1240431&r1=1240430&r2=1240431&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Sat Feb  4 01:26:57 2012
@@ -140,6 +140,7 @@ Source8: hadoop-fuse.default
 Source9: hadoop.nofiles.conf
 Source10: yarn-init.tmpl
 Patch0: MAPREDUCE-3436_rev2.patch
+Patch1: MAPREDUCE-3791.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
 Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service,
bigtop-utils
@@ -321,8 +322,9 @@ AutoReq: no
 Hadoop Filesystem Library
 
 %prep
-%setup -n apache-hadoop-common-aa85a29
+%setup -n apache-hadoop-common-f1d8a9b
 %patch0 -p0
+%patch1 -p0
 
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1240431&r1=1240430&r2=1240431&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Sat Feb  4 01:26:57 2012
@@ -24,7 +24,7 @@ HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
 #HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
 #HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=aa85a29
+HADOOP_TARBALL_SRC=f1d8a9b
 HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
 $(eval $(call PACKAGE,hadoop,HADOOP))
 



Mime
View raw message