Repository: ambari Updated Branches: refs/heads/branch-2.4 00a44d8af -> 87fe06eb7
AMBARI-17971. Ambari upgrade to 2.4.0 adds several config properties that are not necessary and some are incorrect - reverting changes to sqoop-site and atlas-log4j (smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87fe06eb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87fe06eb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87fe06eb Branch: refs/heads/branch-2.4 Commit: 87fe06eb75c493a8c812a3be5bcd5193c7f40dc3 Parents: 00a44d8 Author: Sumit Mohanty <[email protected]> Authored: Tue Aug 2 22:29:24 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Aug 2 22:30:06 2016 -0700 ---------------------------------------------------------------------- .../ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml | 6 +++--- .../SQOOP/1.4.4.2.0/configuration/sqoop-site.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/87fe06eb/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml index 753232a..a071442 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml @@ -24,13 +24,13 @@ <name>atlas_log_level</name> <value>info</value> <description>Log level for atlas logging</description> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>audit_log_level</name> <value>info</value> <description>Log level for audit logging</description> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>content</name> @@ -125,6 +125,6 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/87fe06eb/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml index 20e6d42..f7823d2 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml @@ -30,10 +30,10 @@ <name>atlas.cluster.name</name> </property> </depends-on> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>sqoop.job.data.publish.class</name> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
