Author: tucu
Date: Wed Feb 1 17:46:30 2012
New Revision: 1239231
URL: http://svn.apache.org/viewvc?rev=1239231&view=rev
Log:
Merge -r 1239221:1239222 from trunk to branch. FIXES: HADOOP-8009
Added:
hadoop/common/branches/branch-0.23/hadoop-client/ (props changed)
- copied from r1239222, hadoop/common/trunk/hadoop-client/
hadoop/common/branches/branch-0.23/hadoop-client/pom.xml
- copied, changed from r1239222, hadoop/common/trunk/hadoop-client/pom.xml
hadoop/common/branches/branch-0.23/hadoop-minicluster/ (props changed)
- copied from r1239222, hadoop/common/trunk/hadoop-minicluster/
hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml
- copied, changed from r1239222,
hadoop/common/trunk/hadoop-minicluster/pom.xml
Modified:
hadoop/common/branches/branch-0.23/pom.xml
Propchange: hadoop/common/branches/branch-0.23/hadoop-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 17:46:30 2012
@@ -0,0 +1 @@
+target
Copied: hadoop/common/branches/branch-0.23/hadoop-client/pom.xml (from
r1239222, hadoop/common/trunk/hadoop-client/pom.xml)
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-client/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-client/pom.xml&p1=hadoop/common/trunk/hadoop-client/pom.xml&r1=1239222&r2=1239231&rev=1239231&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-client/pom.xml Wed Feb 1
17:46:30 2012
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Client</description>
Propchange: hadoop/common/branches/branch-0.23/hadoop-minicluster/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 1 17:46:30 2012
@@ -0,0 +1 @@
+target
Copied: hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml (from
r1239222, hadoop/common/trunk/hadoop-minicluster/pom.xml)
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml&p1=hadoop/common/trunk/hadoop-minicluster/pom.xml&r1=1239222&r2=1239231&rev=1239231&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-minicluster/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml Wed Feb 1
17:46:30 2012
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Mini-Cluster</description>
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1239231&r1=1239230&r2=1239231&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Wed Feb 1 17:46:30 2012
@@ -79,6 +79,8 @@
<module>hadoop-mapreduce-project</module>
<module>hadoop-tools</module>
<module>hadoop-dist</module>
+ <module>hadoop-client</module>
+ <module>hadoop-minicluster</module>
</modules>
<build>
