You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/07/16 18:01:22 UTC
git commit: AMBARI-6488. Move global to env in stack definitions
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f160dcfda -> 8af0d0728
AMBARI-6488. Move global to env in stack definitions (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8af0d072
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8af0d072
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8af0d072
Branch: refs/heads/trunk
Commit: 8af0d07283a4ed90e44367e2cdbfa3a07c4319de
Parents: f160dcf
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Jul 16 19:00:44 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Jul 16 19:00:44 2014 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 2 +-
.../stacks/HDP/2.1/services/HIVE/metainfo.xml.rej | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af0d072/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
index 7f44191..f3f1b45 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
@@ -27,7 +27,7 @@
<config-type>hive-site</config-type>
<config-type>hive-log4j</config-type>
<config-type>hive-exec-log4j</config-type>
- <config-type>global</config-type>
+ <config-type>hive-env</config-type>
</configuration-dependencies>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8af0d072/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml.rej
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml.rej b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml.rej
deleted file mode 100644
index 6fb2300..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml.rej
+++ /dev/null
@@ -1,13 +0,0 @@
---- ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
-+++ ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
-@@ -25,9 +25,9 @@
-
- <configuration-dependencies>
- <config-type>hive-site</config-type>
-+ <config-type>hive-env</config-type>
- <config-type>hive-log4j</config-type>
- <config-type>hive-exec-log4j</config-type>
-- <config-type>global</config-type>
- <config-type>mapred-site</config-type>
- </configuration-dependencies>
- </service>