Repository: ambari Updated Branches: refs/heads/branch-2.0.maint f1d1be8de -> 0b00e25b0
Revert "AMBARI-4626. "Capacity Scheduler" section in Ambari does not allow ACL value of "user group" with spaces (aonishuk)" This reverts commit f1d1be8ded1f374a54d2801179ae3a534781a0b9. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b00e25b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b00e25b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b00e25b Branch: refs/heads/branch-2.0.maint Commit: 0b00e25b0d4f7a045c52c047ae15c1bf4e67f4e5 Parents: f1d1be8 Author: Jonathan Hurley <[email protected]> Authored: Mon May 18 17:23:42 2015 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Mon May 18 17:23:42 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, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/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 8693c65..3e3276f 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 + return rendered + "\n" if not rendered.endswith('\n') else rendered class InlineTemplate(Template): def __init__(self, name, extra_imports=[], **kwargs): http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/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 494d3e7..da7a907 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() |e }}</value> + <value>{{ resource_management.core.source.InlineTemplate(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() -%} http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/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 ccbc5cf..c0cd6b3 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,7 +135,9 @@ <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.
