Author: brandonli
Date: Tue Nov 26 18:19:34 2013
New Revision: 1545759
URL: http://svn.apache.org/r1545759
Log:
HDFS-5548. Merging change r1545756 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1545759&r1=1545758&r2=1545759&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Nov 26 18:19:34 2013
@@ -328,6 +328,8 @@ Release 2.2.1 - UNRELEASED
HDFS-5407. Fix typos in DFSClientCache (Haohui Mai via brandonli)
+ HDFS-5548. Use ConcurrentHashMap in portmap (Haohui Mai via brandonli)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
