svn commit: r1558558 - in /hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop.cmd src/main/java/ src/main/java/org/apache/hadoop/ipc/Client.java

[vinodkv]

Author: vinodkv
Date: Wed Jan 15 20:21:49 2014
New Revision: 1558558

URL: http://svn.apache.org/r1558558
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.

Modified:
    
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt 
  (contents, props changed)
    
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
    
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)
    
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

Modified: 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1558558&r1=1558557&r2=1558558&view=diff
==============================================================================
--- 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt 
Wed Jan 15 20:21:49 2014
@@ -517,6 +517,9 @@ Release 2.4.0 - UNRELEASED
     HADOOP-10223. MiniKdc#main() should close the FileReader it creates. 
     (Ted Yu via tucu)
 
+    HADOOP-10236. Fix typo in o.a.h.ipc.Client#checkResponse. (Akira Ajisaka
+    via suresh)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -605,6 +608,8 @@ Release 2.3.0 - UNRELEASED
     HADOOP-10178. Configuration deprecation always emit "deprecated" warnings
     when a new key is used. (Shanyu Zhao via cnauroth)
 
+    HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. (cnauroth)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1558246-1558557

Modified: 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1558558&r1=1558557&r2=1558558&view=diff
==============================================================================
--- 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
 (original)
+++ 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
 Wed Jan 15 20:21:49 2014
@@ -143,7 +143,7 @@ call :updatepath %HADOOP_BIN_PATH%
 
   call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% 
%hadoop-command-arguments%
 
-  goto :eof
+  exit /b %ERRORLEVEL%
 
 :fs 
   set CLASS=org.apache.hadoop.fs.FsShell

Propchange: 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1558246-1558557

Modified: 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1558558&r1=1558557&r2=1558558&view=diff
==============================================================================
--- 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 (original)
+++ 
hadoop/common/branches/YARN-321/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 Wed Jan 15 20:21:49 2014
@@ -286,7 +286,7 @@ public class Client {
       if (!Arrays.equals(id, RpcConstants.DUMMY_CLIENT_ID)) {
         if (!Arrays.equals(id, clientId)) {
           throw new IOException("Client IDs not matched: local ID="
-              + StringUtils.byteToHexString(clientId) + ", ID in reponse="
+              + StringUtils.byteToHexString(clientId) + ", ID in response="
               + 
StringUtils.byteToHexString(header.getClientId().toByteArray()));
         }
       }