Author: arp
Date: Fri Aug 22 18:15:13 2014
New Revision: 1619883
URL: http://svn.apache.org/r1619883
Log:
HDFS-6829: Merging r1619882 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1619883&r1=1619882&r2=1619883&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Aug 22 18:15:13 2014
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java?rev=1619883&r1=1619882&r2=1619883&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
Fri Aug 22 18:15:13 2014
@@ -356,7 +356,7 @@ public class DFSAdmin extends FsShell {
* Construct a DFSAdmin object.
*/
public DFSAdmin() {
- this(null);
+ this(new HdfsConfiguration());
}
/**
