Repository: ambari Updated Branches: refs/heads/branch-2.0.maint 0b00e25b0 -> 1d035163a
Revert "Revert "AMBARI-4626. "Capacity Scheduler" section in Ambari does not allow ACL value of "user group" with spaces (aonishuk)"" This reverts commit 0b00e25b0d4f7a045c52c047ae15c1bf4e67f4e5. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d035163 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d035163 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d035163 Branch: refs/heads/branch-2.0.maint Commit: 1d035163a935b6e826d353c1d752c30c0e0d833b Parents: 0b00e25 Author: Jonathan Hurley <[email protected]> Authored: Tue May 19 13:35:16 2015 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue May 19 13:35:16 2015 -0400 ---------------------------------------------------------------------- ambari-common/src/main/python/resource_management/core/source.py | 2 +- .../python/resource_management/libraries/providers/xml_config.py | 2 +- .../common-services/HDFS/2.1.0.2.0/configuration/core-site.xml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1d035163/ambari-common/src/main/python/resource_management/core/source.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/core/source.py b/ambari-common/src/main/python/resource_management/core/source.py index 3e3276f..8693c65 100644 --- a/ambari-common/src/main/python/resource_management/core/source.py +++ b/ambari-common/src/main/python/resource_management/core/source.py @@ -130,7 +130,7 @@ else: self.context.update(variables) rendered = self.template.render(self.context) - return rendered + "\n" if not rendered.endswith('\n') else rendered + return rendered class InlineTemplate(Template): def __init__(self, name, extra_imports=[], **kwargs): http://git-wip-us.apache.org/repos/asf/ambari/blob/1d035163/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..494d3e7 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(value).get_content() |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() -%} http://git-wip-us.apache.org/repos/asf/ambari/blob/1d035163/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml index c0cd6b3..ccbc5cf 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml @@ -135,9 +135,7 @@ <property> <name>hadoop.security.auth_to_local</name> - <value> - DEFAULT - </value> + <value>DEFAULT</value> <description>The mapping from kerberos principal names to local OS mapreduce.job.user.names. So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component. "[email protected]" and "omalley/[email protected]" to "omalley", if your default domain is APACHE.ORG.
