From 3266709b5d962b34d4380c7204d18e5cee5b66d7 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Thu, 14 Jan 2016 14:17:52 -0800
Subject: [PATCH] HDFS-9415. Document dfs.cluster.administrators and
 dfs.permissions.superusergroup. (Contributed by Xiaobing Zhou)

---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   |  3 +++
 .../src/main/resources/hdfs-default.xml       | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 13e4aec2286..b9762d9b297 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -876,6 +876,9 @@ Release 2.8.0 - UNRELEASED
 
     HDFS-9630. DistCp minor refactoring and clean up. (Kai Zheng via zhz)
 
+    HDFS-9415. Document dfs.cluster.administrators and
+    dfs.permissions.superusergroup. (Xiaobing Zhou via Arpit Agarwal)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index 19c6c6e82b1..6e4c45a7180 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -414,17 +414,24 @@
 <property>
   <name>dfs.permissions.superusergroup</name>
   <value>supergroup</value>
-  <description>The name of the group of super-users.</description>
+  <description>The name of the group of super-users.
+    The value should be a single group name.
+  </description>
 </property>
-<!--
+
 <property>
    <name>dfs.cluster.administrators</name>
-   <value>ACL for the admins</value>
-   <description>This configuration is used to control who can access the
-                default servlets in the namenode, etc.
+   <value></value>
+   <description>ACL for the admins, this configuration is used to control
+     who can access the default servlets in the namenode, etc. The value
+     should be a comma separated list of users and groups. The user list
+     comes first and is separated by a space followed by the group list,
+     e.g. "user1,user2 group1,group2". Both users and groups are optional,
+     so "user1", " group1", "", "user1 group1", "user1,user2 group1,group2"
+     are all valid (note the leading space in " group1"). '*' grants access
+     to all users and groups, e.g. '*', '* ' and ' *' are all valid.
    </description>
 </property>
--->
 
 <property>
   <name>dfs.namenode.acls.enabled</name>