Merge -c 1184989 from trunk to branch-0.23 to complete fix for MAPREDUCE-3101.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184990 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1595,6 +1595,10 @@ Release 0.23.0 - Unreleased
 
     MAPREDUCE-3189. Add link decoration back to MR2's CSS. (Todd Lipcon via
     mahadev)
+    
+    MAPREDUCE-3101. Changed default value of yarn.resourcemanager.acl.enable
+    to true and added some more documentation. (acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java

@@ -129,7 +129,7 @@ public class YarnConfiguration extends Configuration {
   /** Are RM acls enabled.*/
   public static final String RM_ACL_ENABLE = 
     RM_PREFIX + "acl.enable";
-  public static final boolean DEFAULT_RM_ACL_ENABLE = false;
+  public static final boolean DEFAULT_RM_ACL_ENABLE = true;
   
   /** ACL of who can be admin of RM.*/
   public static final String RM_ADMIN_ACL = 

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/resources/yarn-default.xml

@@ -85,7 +85,7 @@
   <property>
     <description>Are RM acls enabled.</description>
     <name>yarn.resourcemanager.acl.enable</name>
-    <value>false</value>
+    <value>true</value>
   </property>
 
   <property>

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm

@@ -194,17 +194,28 @@ Hadoop MapReduce Next Generation - Cluster Setup
 | | <<<ResourceManager>>> host:port for NodeManagers. | |
 | | | <host:port> |
 *-------------------------+-------------------------+------------------------+
+| <<<yarn.resourcemanager.admin.address>>> | | | 
+| | <<<ResourceManager>>> host:port for administrative commands. | |
+| | | <host:port> |
+*-------------------------+-------------------------+------------------------+
+| <<<yarn.resourcemanager.webapp.address>>> | | | 
+| | <<<ResourceManager>>> web-ui host:port. | |
+| | | <host:port> |
+*-------------------------+-------------------------+------------------------+
 | <<<yarn.resourcemanager.scheduler.class>>> | | |
 | | <<<ResourceManager>>> Scheduler class. | |
 | | | <<<CapacityScheduler>>> (recommended) or <<<FifoScheduler>>> |
 *-------------------------+-------------------------+------------------------+
 | <<<yarn.resourcemanager.acl.enable>>> | | |
 | | <<<true>>> / <<<false>>> | |
-| | | Enable ACLs? |
+| | | Enable ACLs? Defaults to <true>. |
 *-------------------------+-------------------------+------------------------+
 | <<<yarn.resourcemanager.admin.acl>>> | | |
 | | Admin ACL | |
 | | | ACL to set admins on the cluster. |
+| | | ACLs are of for <comma-separated-users><space><comma-separated-groups>. |
+| | | Defaults to special value of <<*>> which means <anyone>. |
+| | | Special value of just <space> means no one has access. |
 *-------------------------+-------------------------+------------------------+
 | <<<yarn.nodemanager.remote-app-log-dir>>> | | |
 | | </logs> | |