ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] git commit: AMBARI-4663. Queue ACLs configuration names are wrong (Arsen Babych via aonishuk)
Date Fri, 14 Feb 2014 19:04:54 GMT
Updated Branches:
  refs/heads/trunk cec62b2e4 -> b59b258d2


AMBARI-4663. Queue ACLs configuration names are wrong (Arsen Babych via
aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f60a78f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f60a78f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f60a78f6

Branch: refs/heads/trunk
Commit: f60a78f681870d91aff240db7ca72abcef7be595
Parents: cec62b2
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Fri Feb 14 10:58:44 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Fri Feb 14 10:58:44 2014 -0800

----------------------------------------------------------------------
 .../HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml | 4 ++--
 .../HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml | 4 ++--
 .../src/test/python/stacks/2.0.6/configs/default.hbasedecom.json | 4 ++--
 ambari-server/src/test/python/stacks/2.0.6/configs/default.json  | 4 ++--
 ambari-server/src/test/python/stacks/2.0.6/configs/secured.json  | 4 ++--
 ambari-server/src/test/python/stacks/2.1.1/configs/default.json  | 4 ++--
 ambari-server/src/test/python/stacks/2.1.1/configs/secured.json  | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
index 695a7ed..4ce2462 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
@@ -85,7 +85,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.default.acl_submit_jobs</name>
+    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
     <value>*</value>
     <description>
       The ACL of who can submit jobs to the default queue.
@@ -101,7 +101,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.acl_administer_queues</name>
+    <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
     <value>*</value>
     <description>
       The ACL for who can administer this queue i.e. change sub-queue 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml
index 695a7ed..4ce2462 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/capacity-scheduler.xml
@@ -85,7 +85,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.default.acl_submit_jobs</name>
+    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
     <value>*</value>
     <description>
       The ACL of who can submit jobs to the default queue.
@@ -101,7 +101,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.acl_administer_queues</name>
+    <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
     <value>*</value>
     <description>
       The ACL for who can administer this queue i.e. change sub-queue 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index 82e19e5..16d223e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -298,7 +298,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
             "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
@@ -308,7 +308,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 5013aae..5405b87 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -298,7 +298,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
             "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
@@ -308,7 +308,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 3944239..81da171 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -395,7 +395,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
             "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
@@ -405,7 +405,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.avoid.write.stale.datanode": "true", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
index 00c8950..ebb0742 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1.1/configs/default.json
@@ -297,7 +297,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
             "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
@@ -307,7 +307,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f60a78f6/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
index e2e3ace..2631592 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1.1/configs/secured.json
@@ -394,7 +394,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
             "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
@@ -404,7 +404,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.avoid.write.stale.datanode": "true", 


Mime
View raw message