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 2015/04/24 16:45:56 UTC
ambari git commit: AMBARI-10729. Accumulo Client can't be installed
after enabling security (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 52b5022bc -> bdb46fec1
AMBARI-10729. Accumulo Client can't be installed after enabling security (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bdb46fec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bdb46fec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bdb46fec
Branch: refs/heads/trunk
Commit: bdb46fec104a53c25f5476cdf409303c62b97540
Parents: 52b5022
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Apr 24 17:45:48 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Apr 24 17:45:48 2015 +0300
----------------------------------------------------------------------
.../resource_management/libraries/providers/properties_file.py | 2 +-
.../python/resource_management/libraries/providers/xml_config.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdb46fec/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index 1bc23d6..1d21649 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -42,7 +42,7 @@ class PropertiesFileProvider(Provider):
config_content = InlineTemplate('''# Generated by Apache Ambari. {{time.asctime(time.localtime())}}
{% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(value).get_content().strip() }}{% endfor %}
+{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(str(value)).get_content().strip() }}{% endfor %}
''', extra_imports=[time, resource_management, resource_management.core, resource_management.core.source], properties_dict=self.resource.properties, key_value_delimiter=self.resource.key_value_delimiter)
Logger.info(format("Generating properties file: {filepath}"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdb46fec/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index da7a907..6f6c2a1 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -41,7 +41,7 @@ class XmlConfigProvider(Provider):
{% for key, value in configurations_dict|dictsort %}
<property>
<name>{{ key|e }}</name>
- <value>{{ resource_management.core.source.InlineTemplate(value).get_content().strip() |e }}</value>
+ <value>{{ resource_management.core.source.InlineTemplate(str(value)).get_content().strip() |e }}</value>
{%- if not configuration_attrs is none -%}
{%- for attrib_name, attrib_occurances in configuration_attrs.items() -%}
{%- for property_name, attrib_value in attrib_occurances.items() -%}