Author: tgraves Date: Tue Jan 8 19:53:32 2013 New Revision: 1430470 URL: http://svn.apache.org/viewvc?rev=1430470&view=rev Log: MAPREDUCE-4899 fix branch-2 merge issue in pom
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml?rev=1430470&r1=1430469&r2=1430470&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs-plugins/pom.xml Tue Jan 8 19:53:32 2013 @@ -19,12 +19,12 @@ <parent> <artifactId>hadoop-mapreduce-client</artifactId> <groupId>org.apache.hadoop</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs-plugins</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <name>hadoop-mapreduce-client-hs-plugins</name> <properties>