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 sz...@apache.org on 2014/03/01 02:14:39 UTC
svn commit: r1573120 - in
/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common: ./
dev-support/ src/main/java/ src/main/java/org/apache/hadoop/ipc/
src/main/java/org/apache/hadoop/ipc/protocolPB/ src/main/proto/
Author: szetszwo
Date: Sat Mar 1 01:14:38 2014
New Revision: 1573120
URL: http://svn.apache.org/r1573120
Log:
Merge r1569890 through r1573119 from trunk.
Added:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshCallQueueProtocol.java
- copied unchanged from r1573119, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshCallQueueProtocol.java
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/
- copied from r1573119, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/protocolPB/
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto
- copied unchanged from r1573119, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto
Modified:
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
Modified: hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1573120&r1=1573119&r2=1573120&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt Sat Mar 1 01:14:38 2014
@@ -311,9 +311,6 @@ Release 2.5.0 - UNRELEASED
IMPROVEMENTS
- HADOOP-10278. Refactor to make CallQueue pluggable. (Chris Li via
- Arpit Agarwal)
-
OPTIMIZATIONS
BUG FIXES
@@ -349,6 +346,12 @@ Release 2.4.0 - UNRELEASED
HADOOP-10374. InterfaceAudience annotations should have
RetentionPolicy.RUNTIME (Enis Soztutar via Arpit Agarwal)
+ HADOOP-10278. Refactor to make CallQueue pluggable. (Chris Li via
+ Arpit Agarwal)
+
+ HADOOP-10285. Admin interface to swap callqueue at runtime. (Chris Li via
+ Arpit Agarwal)
+
OPTIMIZATIONS
BUG FIXES
Propchange: hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1573043-1573119
Modified: hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1573120&r1=1573119&r2=1573120&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Sat Mar 1 01:14:38 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/HDFS-5535/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/pom.xml?rev=1573120&r1=1573119&r2=1573120&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/pom.xml Sat Mar 1 01:14:38 2014
@@ -337,6 +337,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>
Propchange: hadoop/common/branches/HDFS-5535/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1572723-1573119