Author: umamahesh
Date: Thu Aug 14 05:00:05 2014
New Revision: 1617881
URL: http://svn.apache.org/r1617881
Log:
Merge. Updated contributors name in CHANGES.txt for HDFS-6783
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=1617881&r1=1617880&r2=1617881&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
Thu Aug 14 05:00:05 2014
@@ -248,7 +248,7 @@ Release 2.6.0 - UNRELEASED
HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a
block replica (Arpit Agarwal)
- HDFS-6783. Fix HDFS CacheReplicationMonitor rescan logic. (Yi Liu via
umamahesh)
+ HDFS-6783. Fix HDFS CacheReplicationMonitor rescan logic. (Yi Liu and
Colin Patrick McCabe via umamahesh)
Release 2.5.0 - UNRELEASED
