Author: todd Date: Wed Mar 28 20:45:13 2012 New Revision: 1306587 URL: http://svn.apache.org/viewvc?rev=1306587&view=rev Log: Merge trunk into HDFS-3042 branch
Modified: hadoop/common/branches/HDFS-3042/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-assemblies/pom.xml hadoop/common/branches/HDFS-3042/hadoop-client/pom.xml hadoop/common/branches/HDFS-3042/hadoop-dist/pom.xml hadoop/common/branches/HDFS-3042/hadoop-minicluster/pom.xml hadoop/common/branches/HDFS-3042/hadoop-project-dist/pom.xml hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml hadoop/common/branches/HDFS-3042/pom.xml Propchange: hadoop/common/branches/HDFS-3042/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1306184-1306586 Modified: hadoop/common/branches/HDFS-3042/hadoop-assemblies/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-assemblies/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-assemblies/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-assemblies/pom.xml Wed Mar 28 20:45:13 2012 @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-assemblies</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <name>Apache Hadoop Assemblies</name> <description>Apache Hadoop Assemblies</description> Modified: hadoop/common/branches/HDFS-3042/hadoop-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-client/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-client/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-client/pom.xml Wed Mar 28 20:45:13 2012 @@ -18,12 +18,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project-dist</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> <description>Apache Hadoop Client</description> Modified: hadoop/common/branches/HDFS-3042/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-dist/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-dist/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Distribution</description> <name>Apache Hadoop Distribution</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-minicluster/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-minicluster/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-minicluster/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-minicluster/pom.xml Wed Mar 28 20:45:13 2012 @@ -18,12 +18,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> <description>Apache Hadoop Mini-Cluster</description> Modified: hadoop/common/branches/HDFS-3042/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project-dist/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-project-dist/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Project Dist POM</description> <name>Apache Hadoop Project Dist POM</name> <packaging>pom</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,11 +17,11 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-main</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Project POM</description> <name>Apache Hadoop Project POM</name> <packaging>pom</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Archives</description> <name>Apache Hadoop Archives</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Distributed Copy</description> <name>Apache Hadoop Distributed Copy</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-extras</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Extras</description> <name>Apache Hadoop Extras</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-rumen</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Rumen</description> <name>Apache Hadoop Rumen</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-streaming</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop MapReduce Streaming</description> <name>Apache Hadoop MapReduce Streaming</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project-dist</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-tools-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Tools Dist</description> <name>Apache Hadoop Tools Dist</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-tools/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-tools</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Tools</description> <name>Apache Hadoop Tools</name> <packaging>pom</packaging> Modified: hadoop/common/branches/HDFS-3042/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/pom.xml Wed Mar 28 20:45:13 2012 @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-main</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Main</description> <name>Apache Hadoop Main</name> <packaging>pom</packaging>