ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-4794. Reconfiguring memory related properties of a service suffixes 'm' to memory related properties of other service. (jaimin)
Date Sun, 23 Feb 2014 03:32:53 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3b57c215e -> d0ccc47cc


AMBARI-4794. Reconfiguring memory related properties of a service suffixes 'm' to memory related
properties of other service. (jaimin)


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

Branch: refs/heads/trunk
Commit: d0ccc47cc1d6d4516421ab651d20d74b9d83d9d5
Parents: 3b57c21
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Sat Feb 22 19:32:28 2014 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Sat Feb 22 19:32:28 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/utils/config.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d0ccc47c/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index d9a4540..5c8d1f3 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -251,7 +251,14 @@ App.config = Em.Object.create({
       properties = (properties.length) ? properties.objectAt(0).properties : {};
       for (var index in properties) {
         var configsPropertyDef =  null;
-        var preDefinedConfig = preDefinedConfigs.filterProperty('serviceName',serviceName).filterProperty('name',
index);
+        var preDefinedConfig;
+        if (_tag.siteName === 'global') {
+        // Unlike other site where one site maps to ones service, global site contains configurations
for multiple services
+        // So Global Configuration should not be filtered out with serviceName.
+          preDefinedConfig = preDefinedConfigs.filterProperty('name', index);
+        } else {
+          preDefinedConfig = preDefinedConfigs.filterProperty('serviceName',serviceName).filterProperty('name',
index);
+        }
         preDefinedConfig.forEach(function(_preDefinedConfig){
           if (selectedServiceNames.contains(_preDefinedConfig.serviceName) || _preDefinedConfig.serviceName
=== 'MISC') {
             configsPropertyDef = _preDefinedConfig;


Mime
View raw message