You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2012/08/08 07:45:17 UTC

svn commit: r1370669 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project: conf/container-executor.cfg hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml hadoop-yarn/ pom.xml

Author: acmurthy
Date: Wed Aug  8 05:44:28 2012
New Revision: 1370669

URL: http://svn.apache.org/viewvc?rev=1370669&view=rev
Log:
Merge -c 1370666 from trunk to branch-2.1.0-alpha to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.

Removed:
    hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/conf/container-executor.cfg
    hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-yarn/
Modified:
    hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
    hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/pom.xml

Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml Wed Aug  8 05:44:28 2012
@@ -77,7 +77,7 @@
             <configuration>
               <executable>protoc</executable>
               <arguments>
-                <argument>-I../../hadoop-yarn/hadoop-yarn-api/src/main/proto/</argument>
+                <argument>-I../../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/</argument>
                 <argument>-Isrc/main/proto/</argument>
                 <argument>--java_out=target/generated-sources/proto</argument>
                 <argument>src/main/proto/mr_protos.proto</argument>

Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/pom.xml?rev=1370669&r1=1370668&r2=1370669&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/pom.xml Wed Aug  8 05:44:28 2012
@@ -39,9 +39,8 @@
   </properties>
 
   <modules>
-    <module>hadoop-yarn</module>
-      <module>hadoop-mapreduce-client</module>
-      <module>hadoop-mapreduce-examples</module>
+    <module>hadoop-mapreduce-client</module>
+    <module>hadoop-mapreduce-examples</module>
   </modules>
 
   <dependencies>