svn commit: r1411235 - in /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client: hadoop-mapreduce-client-app/ hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v

2012-11-19 Thread tomwhite 
Author: tomwhite
Date: Mon Nov 19 15:12:22 2012
New Revision: 1411235

URL: http://svn.apache.org/viewvc?rev=1411235view=rev
Log:
YARN-129. Simplify classpath construction for mini YARN tests.

Modified:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/ssl/TestEncryptedShuffle.java

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411235r1=1411234r2=1411235view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 15:12:22 2012
@@ -89,11 +89,6 @@
 phasetest-compile/phase
   /execution
 /executions
-configuration
-  excludes
-excludemrapp-generated-classpath/exclude
-  /excludes
-/configuration
   /plugin
   plugin
 artifactIdmaven-antrun-plugin/artifactId

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java?rev=1411235r1=1411234r2=1411235view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
 Mon Nov 19 15:12:22 2012
@@ -18,13 +18,8 @@
 
 package org.apache.hadoop.mapreduce.v2.util;
 
-import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URI;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -134,62 +129,24 @@ public class MRApps extends Apps {
 
   private static void setMRFrameworkClasspath(
   MapString, String environment, Configuration conf) throws IOException {
-InputStream classpathFileStream = null;
-BufferedReader reader = null;
-try {
-  // Get yarn mapreduce-app classpath from generated classpath
-  // Works if compile time env is same as runtime. Mainly tests.
-  ClassLoader thisClassLoader =
-  Thread.currentThread().getContextClassLoader();
-  String mrAppGeneratedClasspathFile = mrapp-generated-classpath;
-  classpathFileStream =
-  thisClassLoader.getResourceAsStream(mrAppGeneratedClasspathFile);
-
-  // Put the file itself on classpath for tasks.
-  URL classpathResource = thisClassLoader
-.getResource(mrAppGeneratedClasspathFile);
-  if (classpathResource != null) {
-String classpathElement = classpathResource.getFile();
-if (classpathElement.contains(!)) {
-  classpathElement = classpathElement.substring(0,
-classpathElement.indexOf(!));
-} else {
-  classpathElement = new File(classpathElement).getParent();
-}
-Apps.addToEnvironment(environment, Environment.CLASSPATH.name(),
-  classpathElement);
-  }
-
-  if (classpathFileStream != null) {
-reader = new BufferedReader(new InputStreamReader(classpathFileStream, 
-Charsets.UTF_8));
-String cp = reader.readLine();
-if (cp != null) {
-  Apps.addToEnvironment(environment, Environment.CLASSPATH.name(),
-cp.trim());
-}
-  }
-
-  // Add standard Hadoop classes
-  for (String c : conf.getStrings(
-  YarnConfiguration.YARN_APPLICATION_CLASSPATH,
-  YarnConfiguration.DEFAULT_YARN_APPLICATION_CLASSPATH)) {
-Apps.addToEnvironment(environment, Environment.CLASSPATH.name(), c
-.trim());
-  }
-  for (String c : conf.getStrings(
-  MRJobConfig.MAPREDUCE_APPLICATION_CLASSPATH,
-  MRJobConfig.DEFAULT_MAPREDUCE_APPLICATION_CLASSPATH)) {
-Apps.addToEnvironment(environment,

svn commit: r1411239 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client: hadoop-mapreduce-client-app/ hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop

2012-11-19 Thread tomwhite 
Author: tomwhite
Date: Mon Nov 19 15:16:57 2012
New Revision: 1411239

URL: http://svn.apache.org/viewvc?rev=1411239view=rev
Log:
Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify 
classpath construction for mini YARN tests.

Modified:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/ssl/TestEncryptedShuffle.java

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411239r1=1411238r2=1411239view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 15:16:57 2012
@@ -89,11 +89,6 @@
 phasetest-compile/phase
   /execution
 /executions
-configuration
-  excludes
-excludemrapp-generated-classpath/exclude
-  /excludes
-/configuration
   /plugin
   plugin
 artifactIdmaven-antrun-plugin/artifactId

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java?rev=1411239r1=1411238r2=1411239view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
 Mon Nov 19 15:16:57 2012
@@ -18,13 +18,8 @@
 
 package org.apache.hadoop.mapreduce.v2.util;
 
-import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URI;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -134,62 +129,24 @@ public class MRApps extends Apps {
 
   private static void setMRFrameworkClasspath(
   MapString, String environment, Configuration conf) throws IOException {
-InputStream classpathFileStream = null;
-BufferedReader reader = null;
-try {
-  // Get yarn mapreduce-app classpath from generated classpath
-  // Works if compile time env is same as runtime. Mainly tests.
-  ClassLoader thisClassLoader =
-  Thread.currentThread().getContextClassLoader();
-  String mrAppGeneratedClasspathFile = mrapp-generated-classpath;
-  classpathFileStream =
-  thisClassLoader.getResourceAsStream(mrAppGeneratedClasspathFile);
-
-  // Put the file itself on classpath for tasks.
-  URL classpathResource = thisClassLoader
-.getResource(mrAppGeneratedClasspathFile);
-  if (classpathResource != null) {
-String classpathElement = classpathResource.getFile();
-if (classpathElement.contains(!)) {
-  classpathElement = classpathElement.substring(0,
-classpathElement.indexOf(!));
-} else {
-  classpathElement = new File(classpathElement).getParent();
-}
-Apps.addToEnvironment(environment, Environment.CLASSPATH.name(),
-  classpathElement);
-  }
-
-  if (classpathFileStream != null) {
-reader = new BufferedReader(new InputStreamReader(classpathFileStream, 
-Charsets.UTF_8));
-String cp = reader.readLine();
-if (cp != null) {
-  Apps.addToEnvironment(environment, Environment.CLASSPATH.name(),
-cp.trim());
-}
-  }
-
-  // Add standard Hadoop classes
-  for (String c : conf.getStrings(
-  YarnConfiguration.YARN_APPLICATION_CLASSPATH,
-  YarnConfiguration.DEFAULT_YARN_APPLICATION_CLASSPATH)) {
-Apps.addToEnvironment(environment, Environment.CLASSPATH.name(), c
-.trim());
-  }
-  for (String c

svn commit: r1411292 - /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.jav

2012-11-19 Thread sseth 
Author: sseth
Date: Mon Nov 19 16:43:29 2012
New Revision: 1411292

URL: http://svn.apache.org/viewvc?rev=1411292view=rev
Log:
MAPREDUCE-4723 amendment. Fix JobHistory Event handling. (Contributed by Sandy 
Ryza)

Modified:

hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java?rev=1411292r1=1411291r2=1411292view=diff
==
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 Mon Nov 19 16:43:29 2012
@@ -601,7 +601,7 @@ public class JobHistoryEventHandler exte
   setSummarySlotSeconds(summary, context.getJob(jobId).getAllCounters());
   break;
 default:
-  throw new YarnException(Invalid event type);
+  break;
 }
   }

svn commit: r1411293 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEven

2012-11-19 Thread sseth 
Author: sseth
Date: Mon Nov 19 16:44:28 2012
New Revision: 1411293

URL: http://svn.apache.org/viewvc?rev=1411293view=rev
Log:
merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. 
(Contributed by Sandy Ryza)

Modified:

hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java?rev=1411293r1=1411292r2=1411293view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 Mon Nov 19 16:44:28 2012
@@ -601,7 +601,7 @@ public class JobHistoryEventHandler exte
   setSummarySlotSeconds(summary, context.getJob(jobId).getAllCounters());
   break;
 default:
-  throw new YarnException(Invalid event type);
+  break;
 }
   }

svn commit: r1411441 - in /hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/ hadoop-mapreduce-client/hadoo

2012-11-19 Thread tgraves 
Author: tgraves
Date: Mon Nov 19 21:53:12 2012
New Revision: 1411441

URL: http://svn.apache.org/viewvc?rev=1411441view=rev
Log:
Preparing 0.23.5 release

Modified:
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt?rev=1411441r1=1411440r2=1411441view=diff
==
--- hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/CHANGES.txt 
Mon Nov 19 21:53:12 2012
@@ -1,20 +1,5 @@
 Hadoop MapReduce Change Log
 
-Release 0.23.6 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
-MAPREDUCE-4802. Takes a long time to load the task list on the AM for
-large jobs (Ravi Prakash via bobby)
-
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -123,6 +108,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely
 closed channels (jlowe via bobby)
+
+MAPREDUCE-4802. Takes a long time to load the task list on the AM for
+large jobs (Ravi Prakash via bobby)
  
 Release 0.23.4
 

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411441r1=1411440r2=1411441view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 21:53:12 2012
@@ -19,12 +19,12 @@
   parent
 artifactIdhadoop-mapreduce-client/artifactId
 groupIdorg.apache.hadoop/groupId
-version0.23.6-SNAPSHOT/version
+version0.23.5/version
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-mapreduce-client-app/artifactId
-  version0.23.6-SNAPSHOT/version
+  version0.23.5/version
   namehadoop-mapreduce-client-app/name
 
   properties

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1411441r1=1411440r2=1411441view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
 Mon Nov 19 21:53:12 2012
@@ -19,12 +19,12 @@
   parent
 artifactIdhadoop-mapreduce-client/artifactId
 groupIdorg.apache.hadoop/groupId
-version0.23.6-SNAPSHOT/version
+version0.23.5/version
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.hadoop/groupId
   artifactIdhadoop-mapreduce-client-common/artifactId
-  version0.23.6-SNAPSHOT/version
+  version0.23.5/version
   namehadoop-mapreduce-client-common/name
 
   properties

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
URL:

svn commit: r1411442 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

2012-11-19 Thread tgraves 
Author: tgraves
Date: Mon Nov 19 21:54:42 2012
New Revision: 1411442

URL: http://svn.apache.org/viewvc?rev=1411442view=rev
Log:
Fixing CHANGES.txt to show jiras in re-branched 0.23.5 release

Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: 
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1411442r1=1411441r2=1411442view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon 
Nov 19 21:54:42 2012
@@ -12,9 +12,6 @@ Release 0.23.6 - UNRELEASED
 
   BUG FIXES
 
-MAPREDUCE-4802. Takes a long time to load the task list on the AM for
-large jobs (Ravi Prakash via bobby)
-
 Release 0.23.5 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -123,6 +120,9 @@ Release 0.23.5 - UNRELEASED
 
 MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely
 closed channels (jlowe via bobby)
+
+MAPREDUCE-4802. Takes a long time to load the task list on the AM for
+large jobs (Ravi Prakash via bobby)
  
 Release 0.23.4

svn commit: r1411470 - /hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

2012-11-19 Thread tgraves 
Author: tgraves
Date: Mon Nov 19 22:41:55 2012
New Revision: 1411470

URL: http://svn.apache.org/viewvc?rev=1411470view=rev
Log:
Preparing 0.23.5 release

Modified:

hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

Modified: 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1411470r1=1411469r2=1411470view=diff
==
--- 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 (original)
+++ 
hadoop/common/branches/branch-0.23.5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
 Mon Nov 19 22:41:55 2012
@@ -105,7 +105,7 @@
   target
 symlink link=${applink.base}.jar
 resource=mr-app.jar failonerror=false/
-symlink link=${applink.base}-0.23.6-SNAPSHOT.jar
+symlink link=${applink.base}-0.23.5.jar
 resource=mr-app.jar failonerror=false/
   /target
 /configuration