ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject git commit: AMBARI-6402. Many services failed to start when using custom user names and groups. (onechiporenko)
Date Mon, 07 Jul 2014 17:51:35 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.1 00c99f148 -> daaaf5eb3


AMBARI-6402. Many services failed to start when using custom user names and groups. (onechiporenko)


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

Branch: refs/heads/branch-1.6.1
Commit: daaaf5eb38462f31c545d36c951df04bbb82312b
Parents: 00c99f1
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Jul 7 20:13:43 2014 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Jul 7 20:13:43 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/config.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/daaaf5eb/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 8378c57..cd6e901 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -462,16 +462,20 @@ App.config = Em.Object.create({
           configData.isRequired = (configData.isRequired !== undefined) ? configData.isRequired
: true;
           configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent
: true;
           configData.showLabel = stored.showLabel !== false;
-        } else if (!preDefined && stored) {
-          this.addUserProperty(stored, isAdvanced, advancedConfigs);
-        } else if (preDefined && !stored) {
-          configData = preDefined;
-          configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent
: true;
-          if (isAdvanced) {
-            var advanced = advancedConfigs.findProperty('name', configData.name);
-            this.setPropertyFromStack(configData,advanced);
-          }
         }
+        else
+          if (!preDefined && stored) {
+            configData = this.addUserProperty(stored, isAdvanced, advancedConfigs);
+          }
+          else
+            if (preDefined && !stored) {
+              configData = preDefined;
+              configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined)
? configData.isRequiredByAgent : true;
+              if (isAdvanced) {
+                var advanced = advancedConfigs.findProperty('name', configData.name);
+                this.setPropertyFromStack(configData,advanced);
+              }
+            }
         
         if (configData.displayType === 'checkbox') {
           configData.value = configData.value === 'true'; // convert {String} value to {Boolean}


Mime
View raw message