hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r949003 - in /hadoop/mapreduce/branches/branch-0.21: ./ .eclipse.templates/ ivy/ src/java/org/apache/hadoop/mapred/ src/java/org/apache/hadoop/mapreduce/protocol/
Date Thu, 27 May 2010 21:17:39 GMT
Author: tomwhite
Date: Thu May 27 21:17:39 2010
New Revision: 949003

URL: http://svn.apache.org/viewvc?rev=949003&view=rev
Log:
MAPREDUCE-1810. Fix references to 0.22 in 0.21 branch.

Modified:
    hadoop/mapreduce/branches/branch-0.21/.eclipse.templates/.classpath
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml
    hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java

Modified: hadoop/mapreduce/branches/branch-0.21/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/.eclipse.templates/.classpath?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/.eclipse.templates/.classpath (original)
+++ hadoop/mapreduce/branches/branch-0.21/.eclipse.templates/.classpath Thu May 27 21:17:39
2010
@@ -26,10 +26,10 @@
 	<classpathentry kind="src" path="src/contrib/vaidya/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-0.22.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-test-0.22.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-hdfs-0.22.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/test/hadoop-hdfs-test-0.22.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-0.21.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-test-0.21.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-hdfs-0.21.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/test/hadoop-hdfs-test-0.21.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.3.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.4.jar"/>

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu May 27 21:17:39 2010
@@ -1562,3 +1562,6 @@ Release 0.21.0 - Unreleased
 
     MAPREDUCE-1276. Correct flaws in the shuffle related to connection setup
     and failure attribution. (Amareshwari Sriramadasu via cdouglas)
+
+    MAPREDUCE-1810. Fix references to 0.22 in 0.21 branch. (tomwhite)
+

Modified: hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml Thu May 27 21:17:39
2010
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>0.22.0-dev-SNAPSHOT</version>
+      <version>0.21.0-dev-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties Thu May 27 21:17:39 2010
@@ -41,8 +41,8 @@ ftplet-api.version=1.0.0
 ftpserver-core.version=1.0.0
 ftpserver-deprecated.version=1.0.0-M2
 
-hadoop-core.version=0.22.0-SNAPSHOT
-hadoop-hdfs.version=0.22.0-SNAPSHOT
+hadoop-core.version=0.21.0-SNAPSHOT
+hadoop-hdfs.version=0.21.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/AdminOperationsProtocol.java
Thu May 27 21:17:39 2010
@@ -23,14 +23,15 @@ import java.io.IOException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.ipc.VersionedProtocol;
-import org.apache.hadoop.mapreduce.MRJobConfig;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
 import org.apache.hadoop.security.KerberosInfo;
 
 /**
  * Protocol for admin operations. This is a framework-public interface and is
  * NOT_TO_BE_USED_BY_USERS_DIRECTLY.
  */
-@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
+@KerberosInfo(
+	    serverPrincipal = JTConfig.JT_USER_NAME)
 @InterfaceAudience.Private
 @InterfaceStability.Stable
 public interface AdminOperationsProtocol extends VersionedProtocol {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
Thu May 27 21:17:39 2010
@@ -24,13 +24,17 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.ipc.VersionedProtocol;
 import org.apache.hadoop.mapreduce.MRJobConfig;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
 import org.apache.hadoop.security.KerberosInfo;
 
 /** 
  * Protocol that a TaskTracker and the central JobTracker use to communicate.
  * The JobTracker is the Server, which implements this protocol.
  */ 
-@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
+@KerberosInfo(
+	    serverPrincipal = JTConfig.JT_USER_NAME,
+	    clientPrincipal = TTConfig.TT_USER_NAME)
 @InterfaceAudience.Private
 @InterfaceStability.Stable
 interface InterTrackerProtocol extends VersionedProtocol {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java?rev=949003&r1=949002&r2=949003&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
Thu May 27 21:17:39 2010
@@ -39,6 +39,7 @@ import org.apache.hadoop.mapreduce.TaskT
 import org.apache.hadoop.mapreduce.TaskType;
 import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier;
 import org.apache.hadoop.security.TokenStorage;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
 import org.apache.hadoop.mapreduce.server.jobtracker.State;
 import org.apache.hadoop.security.KerberosInfo;
 import org.apache.hadoop.security.token.Token;
@@ -49,7 +50,8 @@ import org.apache.hadoop.security.token.
  * JobClient can use these methods to submit a Job for execution, and learn about
  * the current system status.
  */ 
-@KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID)
+@KerberosInfo(
+	    serverPrincipal = JTConfig.JT_USER_NAME)
 @TokenInfo(DelegationTokenSelector.class)
 @InterfaceAudience.Private
 @InterfaceStability.Stable



Mime
View raw message