ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [03/50] [abbrv] ambari git commit: AMBARI-14630. Config merge script doesn't work on python 2.6 (aonishuk)
Date Fri, 15 Jan 2016 17:33:27 GMT
AMBARI-14630. Config merge script doesn't work on python 2.6 (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0afdd9b97ea3db050b8f14071e79b4365053c092
Parents: f176b45
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Jan 12 18:55:54 2016 +0200
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Thu Jan 14 11:43:24 2016 -0500

----------------------------------------------------------------------
 ambari-server/src/main/resources/scripts/takeover_config_merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0afdd9b9/ambari-server/src/main/resources/scripts/takeover_config_merge.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/takeover_config_merge.py b/ambari-server/src/main/resources/scripts/takeover_config_merge.py
index 03c650c..ed1da07 100644
--- a/ambari-server/src/main/resources/scripts/takeover_config_merge.py
+++ b/ambari-server/src/main/resources/scripts/takeover_config_merge.py
@@ -63,7 +63,7 @@ class ConfigMerge:
     configurations = {}
     tree = ET.parse(path)
     root = tree.getroot()
-    for properties in root.iter('property'):
+    for properties in root.getiterator('property'):
       name = properties.find('name')
       value = properties.find('value')
 


Mime
View raw message