You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/09/09 19:03:11 UTC
git commit: AMBARI-7222. upgrading a cluster to ambari-1.7.0 should
create cluster-env file (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 16d435dae -> 923549bd5
AMBARI-7222. upgrading a cluster to ambari-1.7.0 should create cluster-env file (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/923549bd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/923549bd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/923549bd
Branch: refs/heads/trunk
Commit: 923549bd5cdd008bf0331bdaf46a08cbd34860da
Parents: 16d435d
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Sep 9 20:03:02 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Sep 9 20:03:02 2014 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ambari/server/state/ConfigHelper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/923549bd/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 6d70695..790c177 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -423,6 +423,8 @@ public class ConfigHelper {
for(Service service : clusters.getCluster(clusterName).getServices().values()) {
Set<PropertyInfo> stackProperties = ambariMetaInfo.getProperties(stack.getName(), stack.getVersion(), service.getName());
+ Set<PropertyInfo> stackLevelProperties = ambariMetaInfo.getStackProperties(stack.getName(), stack.getVersion());
+ stackProperties.addAll(stackLevelProperties);
for (PropertyInfo stackProperty : stackProperties) {
if(stackProperty.getName().equals(propertyName)) {
@@ -432,7 +434,6 @@ public class ConfigHelper {
result.add(configType);
}
}
-
}
return result;