Repository: hadoop Updated Branches: refs/heads/HDFS-6581 032e0eba6 -> 263977969
Fix test build break after merging from trunk Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26397796 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26397796 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26397796 Branch: refs/heads/HDFS-6581 Commit: 263977969b98a2d7a26a7c11e4467c9de836fbe6 Parents: 032e0eb Author: arp <[email protected]> Authored: Thu Sep 25 20:29:24 2014 -0700 Committer: arp <[email protected]> Committed: Thu Sep 25 20:29:24 2014 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26397796/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java index df1864c..f34f760 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java @@ -716,7 +716,7 @@ public class TestEncryptionZones { private static void mockCreate(ClientProtocol mcp, CipherSuite suite, CryptoProtocolVersion version) throws Exception { Mockito.doReturn( - new HdfsFileStatus(0, false, 1, 1024, 0, 0, new FsPermission( + new HdfsFileStatus(0, false, 1, 1024, false, 0, 0, new FsPermission( (short) 777), "owner", "group", new byte[0], new byte[0], 1010, 0, new FileEncryptionInfo(suite, version, new byte[suite.getAlgorithmBlockSize()],
