You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/02/28 14:17:40 UTC
git commit: AMBARI-4880. Nagios metainfo.xml needs some
corrections.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 036b14097 -> 925df0341
AMBARI-4880. Nagios metainfo.xml needs some corrections.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/925df034
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/925df034
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/925df034
Branch: refs/heads/trunk
Commit: 925df0341fc3671391d1f63400e0c8ba5d23adf7
Parents: 036b140
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Feb 28 15:15:30 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Feb 28 15:15:30 2014 +0200
----------------------------------------------------------------------
.../HDP/1.3.2/services/NAGIOS/metainfo.xml | 51 +++++++++++++-------
.../HDP/2.0.6/services/NAGIOS/metainfo.xml | 11 ++++-
2 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/925df034/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
index a4c500d..8101be1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/metainfo.xml
@@ -73,32 +73,49 @@
</packages>
</osSpecific>
<osSpecific>
- <osType>suse</osType>
- <package>
- <type>rpm</type>
- <name>php5-json</name>
- </package>
+ <osType>suse11</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php5-json</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>sles11</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php5-json</name>
+ </package>
+ </packages>
</osSpecific>
<osSpecific>
<osType>centos5</osType>
- <package>
- <type>rpm</type>
- <name>php-pecl-json.x86_64</name>
- </package>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </packages>
</osSpecific>
<osSpecific>
<osType>redhat5</osType>
- <package>
- <type>rpm</type>
- <name>php-pecl-json.x86_64</name>
- </package>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </packages>
</osSpecific>
<osSpecific>
<osType>oraclelinux5</osType>
- <package>
- <type>rpm</type>
- <name>php-pecl-json.x86_64</name>
- </package>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </packages>
</osSpecific>
</osSpecifics>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/925df034/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
index a7396b9..8ab726e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
@@ -72,7 +72,16 @@
</packages>
</osSpecific>
<osSpecific>
- <osType>suse</osType>
+ <osType>suse11</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>php5-json</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>sles11</osType>
<packages>
<package>
<type>rpm</type>