incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1209832 - /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch
Date Sat, 03 Dec 2011 04:52:52 GMT
Author: rvs
Date: Sat Dec  3 04:52:51 2011
New Revision: 1209832

URL: http://svn.apache.org/viewvc?rev=1209832&view=rev
Log:
Modifying PIG patch to fit 0.9 branch

Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch?rev=1209832&r1=1209831&r2=1209832&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/patch Sat Dec  3
04:52:51 2011
@@ -27,8 +27,8 @@ Index: shims/test/hadoop23/org/apache/pi
              m_conf.set("alternative.mapreduce.job.cache.files", cachefile);
 Index: ivy.xml
 ===================================================================
---- ivy.xml	(revision 1208121)
-+++ ivy.xml	(working copy)
+--- ivy.xml	2011-11-21 17:26:11.000000000 -0800
++++ ivy.xml	2011-12-02 20:49:31.149818867 -0800
 @@ -67,41 +67,50 @@
      <dependency org="org.apache.hadoop" name="hadoop-test" rev="${hadoop-test.version}"
        conf="hadoop20->default"/>
@@ -69,30 +69,30 @@ Index: ivy.xml
          <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
          <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
      </dependency>
+-    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${hadoop-mapreduce.version}"
+-      conf="hadoop23->master">
+-      <artifact name="hadoop-yarn-server-tests" type="jar" m:classifier="tests"/>
+-    </dependency>
+-    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
+-      rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/>
 +    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-shuffle" 
 +      rev="${hadoop-mapreduce.version}" conf="hadoop23->default"/>
-+    <dependency org="org.apache.hadoop" name="hadoop-yarn-api" 
-+      rev="${hadoop-common.version}" conf="hadoop23->default"/>
-+    <dependency org="org.apache.hadoop" name="hadoop-yarn-common" 
-+      rev="${hadoop-common.version}" conf="hadoop23->default"/>
-+    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" 
-+      rev="${hadoop-common.version}" conf="hadoop23->default"/>
-+    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" 
-+      rev="${hadoop-common.version}" conf="hadoop23->default"/>
-     <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${hadoop-mapreduce.version}"
-       conf="hadoop23->master">
-       <artifact name="hadoop-yarn-server-tests" type="jar" m:classifier="tests"/>
-     </dependency>
--    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common" 
--      rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/>
--    <dependency org="org.apache.hadoop" name="hadoop-yarn-api" 
+     <dependency org="org.apache.hadoop" name="hadoop-yarn-api" 
 -      rev="${hadoop-common.version}" conf="hadoop23->master"/>
--    <dependency org="org.apache.hadoop" name="hadoop-yarn-common" 
++      rev="${hadoop-common.version}" conf="hadoop23->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-yarn-common" 
 -      rev="${hadoop-common.version}" conf="hadoop23->master"/>
--    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" 
++      rev="${hadoop-common.version}" conf="hadoop23->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" 
 -      rev="${hadoop-common.version}" conf="hadoop23->master"/>
--    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" 
++      rev="${hadoop-common.version}" conf="hadoop23->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" 
 -      rev="${hadoop-common.version}" conf="hadoop23->master"/>
++      rev="${hadoop-common.version}" conf="hadoop23->default"/>
++    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${hadoop-mapreduce.version}"
++      conf="hadoop23->master">
++      <artifact name="hadoop-yarn-server-tests" type="jar" m:classifier="tests"/>
++    </dependency>
      <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}"
        conf="compile->master"/>
      <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}"



Mime
View raw message