You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/12 13:49:18 UTC
[33/35] ambari git commit: Revert "AMBARI-20443. No need to show
'hive_ambari_database' (Masahiro Tanaka via alejandro)"
Revert "AMBARI-20443. No need to show 'hive_ambari_database' (Masahiro Tanaka via alejandro)"
This reverts commit 69c55935a57252e3490bfed6905b1bb2fb8ce86d.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/273653b5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/273653b5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/273653b5
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 273653b5a6057951f9df6ab7781e9ddcbd3c448c
Parents: 0ac0ba4
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed Apr 12 15:22:46 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Wed Apr 12 15:22:46 2017 +0200
----------------------------------------------------------------------
.../common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml | 3 +--
.../common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/273653b5/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index ad668a2..5f56617 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -117,8 +117,7 @@
<name>hive_ambari_database</name>
<value>MySQL</value>
<description>Database type.</description>
- <deleted>true</true>
- <on-ambari-upgrade add="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_database_name</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/273653b5/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
index 872120c..4ed26f7 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
@@ -86,7 +86,6 @@
<name>hive_ambari_database</name>
<value>MySQL</value>
<description>Database type.</description>
- <deleted>true</true>
<on-ambari-upgrade add="false"/>
</property>
<property>