ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-14630. Config merge script doesn't work on python 2.6 (aonishuk)
Date Tue, 12 Jan 2016 16:56:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 f2a917731 -> ac0053c44
  refs/heads/trunk 4917a2385 -> 27a6ecf2d


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/27a6ecf2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27a6ecf2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27a6ecf2

Branch: refs/heads/trunk
Commit: 27a6ecf2df0e2401dd12737e62dd8171fc4a00dc
Parents: 4917a23
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Jan 12 18:55:54 2016 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Jan 12 18:55:54 2016 +0200

----------------------------------------------------------------------
 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/27a6ecf2/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