Repository: ambari Updated Branches: refs/heads/trunk 22c6e54e7 -> 6a8ae7f1b
AMBARI-4990. metainfo.xml cleanup.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a8ae7f1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a8ae7f1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a8ae7f1 Branch: refs/heads/trunk Commit: 6a8ae7f1bb4e2d25bbfc34cca3a9b83f5bc6c54e Parents: 22c6e54 Author: Vitaly Brodetskyi <[email protected]> Authored: Tue Mar 11 11:04:50 2014 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Tue Mar 11 11:04:50 2014 +0200 ---------------------------------------------------------------------- .../HDP/1.3.2/services/GANGLIA/metainfo.xml | 53 +++++++++++++------- .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 11 +++- .../HDP/2.0.6/services/GANGLIA/metainfo.xml | 33 ++++++++---- .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 11 +++- 4 files changed, 80 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6a8ae7f1/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml index 36381ce..213c4ba 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/metainfo.xml @@ -83,29 +83,48 @@ </packages> </osSpecific> <osSpecific> - <osType>suse</osType> - <package> - <type>rpm</type> - <name>apache2</name> - </package> - <package> - <type>rpm</type> - <name>apache2-mod_php5</name> - </package> + <osType>suse11</osType> + <packages> + <package> + <type>rpm</type> + <name>apache2</name> + </package> + <package> + <type>rpm</type> + <name>apache2-mod_php5</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osType>sles11</osType> + <packages> + <package> + <type>rpm</type> + <name>apache2</name> + </package> + <package> + <type>rpm</type> + <name>apache2-mod_php5</name> + </package> + </packages> </osSpecific> <osSpecific> <osType>centos5</osType> - <package> - <type>rpm</type> - <name>httpd</name> - </package> + <packages> + <package> + <type>rpm</type> + <name>httpd</name> + </package> + </packages> </osSpecific> <osSpecific> <osType>centos6</osType> - <package> - <type>rpm</type> - <name>httpd</name> - </package> + <packages> + <package> + <type>rpm</type> + <name>httpd</name> + </package> + </packages> </osSpecific> </osSpecifics> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/6a8ae7f1/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml index be1fe70..673fe66 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml @@ -123,7 +123,16 @@ </packages> </osSpecific> <osSpecific> - <osType>suse</osType> + <osType>suse11</osType> + <packages> + <package> + <type>rpm</type> + <name>mysql-client</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osType>sles11</osType> <packages> <package> <type>rpm</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/6a8ae7f1/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml index 3bc07d6..a92c6d9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml @@ -78,15 +78,30 @@ </packages> </osSpecific> <osSpecific> - <osType>suse</osType> - <package> - <type>rpm</type> - <name>apache2</name> - </package> - <package> - <type>rpm</type> - <name>apache2-mod_php5</name> - </package> + <osType>suse11</osType> + <packages> + <package> + <type>rpm</type> + <name>apache2</name> + </package> + <package> + <type>rpm</type> + <name>apache2-mod_php5</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osType>sles11</osType> + <packages> + <package> + <type>rpm</type> + <name>apache2</name> + </package> + <package> + <type>rpm</type> + <name>apache2-mod_php5</name> + </package> + </packages> </osSpecific> <osSpecific> <osType>centos6</osType> http://git-wip-us.apache.org/repos/asf/ambari/blob/6a8ae7f1/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml index d551e36..6313924 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml @@ -135,7 +135,16 @@ </packages> </osSpecific> <osSpecific> - <osType>suse</osType> + <osType>suse11</osType> + <packages> + <package> + <type>rpm</type> + <name>mysql-client</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osType>sles11</osType> <packages> <package> <type>rpm</type>
