ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-4179. Ambari UI should not allow to override pid dirs. (yusaku)
Date Fri, 27 Dec 2013 22:59:18 GMT
Updated Branches:
  refs/heads/trunk 6295e773d -> 873e9b34b


AMBARI-4179. Ambari UI should not allow to override pid dirs. (yusaku)


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

Branch: refs/heads/trunk
Commit: 873e9b34b07c062fdce3e3a5171ff1cc73b60188
Parents: 6295e77
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Fri Dec 27 13:58:04 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Fri Dec 27 14:40:49 2013 -0800

----------------------------------------------------------------------
 ambari-web/app/data/HDP2/global_properties.js | 4 ++++
 ambari-web/app/models/service_config.js       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/873e9b34/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index d174110..2139ce9 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -280,6 +280,7 @@ module.exports =
       "description": "",
       "defaultValue": "/var/log/hadoop-mapreduce",
       "displayType": "directory",
+      "isOverridable": false,
       "isVisible": true,
       "isReconfigurable": false,
       "serviceName": "MAPREDUCE2",
@@ -292,6 +293,7 @@ module.exports =
       "description": "",
       "defaultValue": "/var/run/hadoop-mapreduce",
       "displayType": "directory",
+      "isOverridable": false,
       "isVisible": true,
       "isReconfigurable": false,
       "serviceName": "MAPREDUCE2",
@@ -376,6 +378,7 @@ module.exports =
       "description": "",
       "defaultValue": "/var/log/hadoop-yarn",
       "displayType": "directory",
+      "isOverridable": false,
       "isReconfigurable": false,
       "isVisible": true,
       "serviceName": "YARN",
@@ -388,6 +391,7 @@ module.exports =
       "description": "",
       "defaultValue": "/var/run/hadoop-yarn",
       "displayType": "directory",
+      "isOverridable": false,
       "isVisible": true,
       "isReconfigurable": false,
       "serviceName": "YARN",

http://git-wip-us.apache.org/repos/asf/ambari/blob/873e9b34/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 43e5b77..40568c8 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -180,7 +180,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
    * and fields which represent master hosts.
    */
   isPropertyOverridable: function () {
-    var overrideable = this.get('name').contains('pid_dir') ? false : this.get('isOverridable');
+    var overrideable = this.get('isOverridable');
     var editable = this.get('isEditable');
     var overrides = this.get('overrides');
     var dt = this.get('displayType');


Mime
View raw message