Author: brandonli
Date: Fri Nov 22 00:03:23 2013
New Revision: 1544379
URL: http://svn.apache.org/r1544379
Log:
HDFS-5407. Merge change r1544378 from branch-2
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java?rev=1544379&r1=1544378&r2=1544379&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
Fri Nov 22 00:03:23 2013
@@ -99,7 +99,7 @@ class DFSClientCache {
this.config = config;
this.clientCache = CacheBuilder.newBuilder()
.maximumSize(clientCache)
- .removalListener(clientRemovealListener())
+ .removalListener(clientRemovalListener())
.build(clientLoader());
this.inputstreamCache = CacheBuilder.newBuilder()
@@ -127,7 +127,7 @@ class DFSClientCache {
};
}
- private RemovalListener<String, DFSClient> clientRemovealListener() {
+ private RemovalListener<String, DFSClient> clientRemovalListener() {
return new RemovalListener<String, DFSClient>() {
@Override
public void onRemoval(RemovalNotification<String, DFSClient>
notification) {
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1544379&r1=1544378&r2=1544379&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Nov 22 00:03:23 2013
@@ -115,6 +115,8 @@ Release 2.2.1 - UNRELEASED
HDFS-5288. Close idle connections in portmap (Haohui Mai via brandonli)
+ HDFS-5407. Fix typos in DFSClientCache (Haohui Mai via brandonli)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
