Author: arp
Date: Tue Oct 29 21:05:15 2013
New Revision: 1536890
URL: http://svn.apache.org/r1536890
Log:
Merging r1536573 through r1536889 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Propchange: hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1536559-1536571,1536573-1536889
Modified:
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1536890&r1=1536889&r2=1536890&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Oct 29 21:05:15 2013
@@ -381,10 +381,6 @@ Release 2.3.0 - UNRELEASED
HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu)
- HDFS-4657. Limit the number of blocks logged by the NN after a block
- report to a configurable value. (Aaron T. Myers via Colin Patrick
- McCabe)
-
HDFS-4278. Log an ERROR when DFS_BLOCK_ACCESS_TOKEN_ENABLE config is
disabled but security is turned on. (Kousuke Saruta via harsh)
@@ -514,6 +510,10 @@ Release 2.2.1 - UNRELEASED
HDFS-5331. make SnapshotDiff.java to a o.a.h.util.Tool interface
implementation.
(Vinayakumar B via umamahesh)
+ HDFS-4657. Limit the number of blocks logged by the NN after a block
+ report to a configurable value. (Aaron T. Myers via Colin Patrick
+ McCabe)
+
OPTIMIZATIONS
BUG FIXES
