From d9e55176b81863e0ca13c81515ad6888a1b36e7f Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Fri, 22 Aug 2014 18:15:13 +0000 Subject: [PATCH] HDFS-6829: Merging r1619882 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619883 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 70f53e23cfb..9216bd44fc6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -282,6 +282,9 @@ Release 2.6.0 - UNRELEASED HDFS-6890. NFS readdirplus doesn't return dotdot attributes (brandonli) + HDFS-6829. DFSAdmin refreshSuperUserGroupsConfiguration failed in + security cluster (zhaoyunjiong via Arpit Agarwal) + Release 2.5.0 - 2014-08-11 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index f4d39a830de..ad7be18a67c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -356,7 +356,7 @@ static int run(DistributedFileSystem dfs, String[] argv, int idx) throws IOExcep * Construct a DFSAdmin object. */ public DFSAdmin() { - this(null); + this(new HdfsConfiguration()); } /**