Repository: ambari Updated Branches: refs/heads/branch-2.0.maint f5d0397f2 -> f1d1be8de
AMBARI-4626. "Capacity Scheduler" section in Ambari does not allow ACL value of "user group" with spaces (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1d1be8d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1d1be8d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1d1be8d Branch: refs/heads/branch-2.0.maint Commit: f1d1be8ded1f374a54d2801179ae3a534781a0b9 Parents: f5d0397 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon May 18 21:31:59 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon May 18 21:31:59 2015 +0300 ---------------------------------------------------------------------- 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/f1d1be8d/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/f1d1be8d/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/f1d1be8d/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. "omal...@apache.org" and "omalley/ad...@apache.org" to "omalley", if your default domain is APACHE.ORG.
