You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/02/28 21:45:03 UTC

svn commit: r1573068 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/hadoop/ipc/protocolPB/ src/main/proto/

Author: arp
Date: Fri Feb 28 20:45:03 2014
New Revision: 1573068

URL: http://svn.apache.org/r1573068
Log:
HADOOP-10285. Merging r1573063 from branch-2 to branch-2.4.

Added:
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshCallQueueProtocol.java
      - copied unchanged from r1573063, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshCallQueueProtocol.java
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/
      - copied from r1573063, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto
      - copied unchanged from r1573063, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto
Modified:
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/pom.xml

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1573068&r1=1573067&r2=1573068&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt Fri Feb 28 20:45:03 2014
@@ -9,6 +9,9 @@ Release 2.4.0 - UNRELEASED
     HADOOP-10184. Hadoop Common changes required to support HDFS ACLs. (See
     breakdown of tasks below for features and contributors)
 
+    HADOOP-10285. Admin interface to swap callqueue at runtime. (Chris Li via
+    Arpit Agarwal)
+
   IMPROVEMENTS
 
     HADOOP-10139. Update and improve the Single Cluster Setup document.

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1573068&r1=1573067&r2=1573068&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Fri Feb 28 20:45:03 2014
@@ -301,6 +301,10 @@
       <!-- protobuf generated code -->
       <Class name="~org\.apache\.hadoop\.ipc\.protobuf\.TestProtos.*"/>
     </Match>
+    <Match>
+      <!-- protobuf generated code -->
+      <Class name="~org\.apache\.hadoop\.ipc\.proto\.RefreshCallQueueProtocolProtos.*"/>
+    </Match>
 
     <!--
        Manually checked, misses child thread manually syncing on parent's intrinsic lock.

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/pom.xml?rev=1573068&r1=1573067&r2=1573068&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/pom.xml Fri Feb 28 20:45:03 2014
@@ -333,6 +333,7 @@
                   <include>GetUserMappingsProtocol.proto</include>
                   <include>RefreshAuthorizationPolicyProtocol.proto</include>
                   <include>RefreshUserMappingsProtocol.proto</include>
+                  <include>RefreshCallQueueProtocol.proto</include>
                 </includes>
               </source>
               <output>${project.build.directory}/generated-sources/java</output>