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

HADOOP-10395. Merging r1575562 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576142 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-03-10 23:58:05 +00:00
parent 134a29f226
commit 4af360d629
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -110,6 +110,8 @@ Release 2.4.0 - UNRELEASED
HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo) HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo)
HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
HADOOP-10185. FileSystem API for ACLs. (cnauroth) HADOOP-10185. FileSystem API for ACLs. (cnauroth)

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
View File

@ -190,8 +190,6 @@ public class TestCallQueueManager {
Thread.sleep(10); Thread.sleep(10);
assertTrue(manager.size() > 0);
for (int i=0; i < 5; i++) { for (int i=0; i < 5; i++) {
manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null); manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
} }