You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2012/08/08 07:45:16 UTC
svn commit: r1370669 [2/2] - in /hadoop/common/branches/branch-2.1.0-alpha:
./ dev-support/ hadoop-assemblies/src/main/resources/assemblies/
hadoop-dist/ hadoop-yarn-project/ hadoop-yarn-project/hadoop-yarn/
hadoop-yarn-project/hadoop-yarn/bin/ hadoop-...
Modified: hadoop/common/branches/branch-2.1.0-alpha/dev-support/smart-apply-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/dev-support/smart-apply-patch.sh?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/dev-support/smart-apply-patch.sh (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/dev-support/smart-apply-patch.sh Wed Aug 8 05:44:28 2012
@@ -78,15 +78,15 @@ if $PATCH -p0 -E --dry-run < $PATCH_FILE
if [[ -d hadoop-common-project ]]; then
echo Looks like this is being run at project root
- # if all of the lines start with hadoop-common/, hadoop-hdfs/, or hadoop-mapreduce/, this is
+ # if all of the lines start with hadoop-common/, hadoop-hdfs/, hadoop-yarn/ or hadoop-mapreduce/, this is
# relative to the hadoop root instead of the subproject root, so we need
# to chop off another layer
- elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-mapreduce-project)$ ]]; then
+ elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-yarn-project|hadoop-mapreduce-project)$ ]]; then
echo Looks like this is relative to project root. Increasing PLEVEL
PLEVEL=$[$PLEVEL + 1]
- elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-mapreduce-project' ; then
+ elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-yarn-project\|hadoop-mapreduce-project' ; then
echo Looks like this is a cross-subproject patch. Try applying from the project root
cleanup 1
fi
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Wed Aug 8 05:44:28 2012
@@ -24,19 +24,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>yarn</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
@@ -53,25 +40,6 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>libexec</outputDirectory>
- <includes>
- <include>yarn-config.sh</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>sbin</outputDirectory>
- <includes>
- <include>yarn-daemon.sh</include>
- <include>yarn-daemons.sh</include>
- <include>start-yarn.sh</include>
- <include>stop-yarn.sh</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
<directory>bin</directory>
<outputDirectory>sbin</outputDirectory>
<includes>
@@ -80,7 +48,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>hadoop-yarn/conf</directory>
+ <directory>conf</directory>
<outputDirectory>etc/hadoop</outputDirectory>
<includes>
<include>**/*</include>
Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-dist/pom.xml?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-dist/pom.xml Wed Aug 8 05:44:28 2012
@@ -120,6 +120,7 @@
run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
+ run cp -r $ROOT/hadoop-yarn-project/target/hadoop-yarn-project-${project.version}/* .
run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* .
echo
Copied: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/CHANGES.txt (from r1370666, hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/CHANGES.txt?p2=hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/CHANGES.txt&p1=hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt&r1=1370666&r2=1370669&rev=1370669&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/CHANGES.txt Wed Aug 8 05:44:28 2012
@@ -26,7 +26,7 @@ Release 2.1.0-alpha - Unreleased
NEW FEATURES
- YARN-1. Promote YARN to be a sub-project of Apache Hadoop. (acmurthy)
+ YARN-1. Promote YARN to be a sub-project of Apache Hadoop. (acmurthy)
IMPROVEMENTS
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+target
+.project
+.settings
+
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,11 @@
+configure
+Makefile.in
+config.log
+config.status
+depcomp
+compile
+missing
+Makefile
+aclocal.m4
+container-executor
+install-sh
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,2 @@
+.dirstamp
+.deps
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Propchange: hadoop/common/branches/branch-2.1.0-alpha/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 8 05:44:28 2012
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/branch-2.1.0-alpha/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/pom.xml?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/pom.xml Wed Aug 8 05:44:28 2012
@@ -78,6 +78,7 @@ xsi:schemaLocation="http://maven.apache.
<module>hadoop-assemblies</module>
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
+ <module>hadoop-yarn-project</module>
<module>hadoop-mapreduce-project</module>
<module>hadoop-tools</module>
<module>hadoop-dist</module>