Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5244. Merge 1577254 from trunk: 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577255 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2014-03-13 17:24:33 +00:00
parent eaf54d5a10
commit a19b5531ca
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -364,6 +364,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6096. TestWebHdfsTokens may timeout. (szetszwo via Arpit Agarwal) HDFS-6096. TestWebHdfsTokens may timeout. (szetszwo via Arpit Agarwal)
HDFS-5244. TestNNStorageRetentionManager#testPurgeMultipleDirs fails.
(Jinghui Wang via suresh)
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java
View File

@ -268,7 +268,7 @@ public class TestNNStorageRetentionManager {
} }
private class TestCaseDescription { private class TestCaseDescription {
private Map<File, FakeRoot> dirRoots = Maps.newHashMap(); private Map<File, FakeRoot> dirRoots = Maps.newLinkedHashMap();
private Set<File> expectedPurgedLogs = Sets.newLinkedHashSet(); private Set<File> expectedPurgedLogs = Sets.newLinkedHashSet();
private Set<File> expectedPurgedImages = Sets.newLinkedHashSet(); private Set<File> expectedPurgedImages = Sets.newLinkedHashSet();