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

HDFS-6069. Merging change r1575184 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575192 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-03-07 06:14:24 +00:00
parent d7ef2df14f
commit d9e52c379c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,6 +478,8 @@ Release 2.4.0 - UNRELEASED
HDFS-6063. TestAclCLI fails intermittently when running test 24: HDFS-6063. TestAclCLI fails intermittently when running test 24:
copyFromLocal. (cnauroth) copyFromLocal. (cnauroth)
HDFS-6069. Quash stack traces when ACLs are disabled. (cnauroth)
Release 2.3.1 - UNRELEASED Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
View File

@ -62,6 +62,7 @@ import org.apache.hadoop.ha.protocolPB.HAServiceProtocolServerSideTranslatorPB;
import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.HDFSPolicyProvider; import org.apache.hadoop.hdfs.HDFSPolicyProvider;
import org.apache.hadoop.hdfs.protocol.AclException;
import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException; import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.BlockListAsLongs; import org.apache.hadoop.hdfs.protocol.BlockListAsLongs;
@ -350,7 +351,8 @@ class NameNodeRpcServer implements NamenodeProtocols {
InvalidToken.class, InvalidToken.class,
LeaseExpiredException.class, LeaseExpiredException.class,
NSQuotaExceededException.class, NSQuotaExceededException.class,
DSQuotaExceededException.class); DSQuotaExceededException.class,
AclException.class);
} }
/** Allow access to the client RPC server for testing */ /** Allow access to the client RPC server for testing */