Repository: ambari Updated Branches: refs/heads/trunk 02b2cb8b9 -> 1830dcf6d
Revert "AMBARI-5459 Usability: Improve Stack Definition support for repositories (dsen)" This reverts commit 7a251ae7e887b4ec4714d4d0484e12598b4ca32f. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1830dcf6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1830dcf6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1830dcf6 Branch: refs/heads/trunk Commit: 1830dcf6db99a5ec2f3403037bea9f5f3b184ee1 Parents: 02b2cb8 Author: Sumit Mohanty <[email protected]> Authored: Thu Apr 24 15:46:22 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Apr 24 15:46:22 2014 -0700 ---------------------------------------------------------------------- .../resources/stacks/HDP/1.3.2/repos/repoinfo.xml | 15 --------------- .../resources/stacks/HDP/1.3.3/repos/repoinfo.xml | 15 --------------- .../resources/stacks/HDP/2.0.6/repos/repoinfo.xml | 15 --------------- .../stacks/HDP/2.0.6/services/GANGLIA/metainfo.xml | 14 +++++++------- .../stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml | 8 ++++---- .../main/resources/stacks/HDP/2.0/repos/repoinfo.xml | 15 --------------- .../main/resources/stacks/HDP/2.1/repos/repoinfo.xml | 15 --------------- 7 files changed, 11 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml index b8ab100..657ee1f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/repos/repoinfo.xml @@ -22,11 +22,6 @@ <repoid>HDP-1.3.2</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos6</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="redhat5"> <repo> @@ -34,11 +29,6 @@ <repoid>HDP-1.3.2</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos5</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="suse11"> <repo> @@ -46,10 +36,5 @@ <repoid>HDP-1.3.2</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/suse11</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml index ef17e54..bf11e25 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/repos/repoinfo.xml @@ -22,11 +22,6 @@ <repoid>HDP-1.3.3</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos6</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="redhat5"> <repo> @@ -34,11 +29,6 @@ <repoid>HDP-1.3.3</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/centos5</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="suse11"> <repo> @@ -46,10 +36,5 @@ <repoid>HDP-1.3.3</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.16/repos/suse11</baseurl> - <repoid>HDP-UTILS-2.1-16</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml index d8bcbdb..0aa9248 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml @@ -22,11 +22,6 @@ <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="redhat5"> <repo> @@ -34,22 +29,12 @@ <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="suse11"> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.1</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/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 d8ea723..f36a7b7 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 @@ -49,31 +49,31 @@ <packages> <package> <type>rpm</type> - <name>libganglia</name> + <name>libganglia-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>ganglia-devel</name> + <name>ganglia-devel-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>ganglia-gmetad</name> + <name>ganglia-gmetad-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>ganglia-web</name> + <name>ganglia-web-3.5.7-99.noarch</name> </package> <package> <type>rpm</type> - <name>python-rrdtool</name> + <name>python-rrdtool.x86_64</name> </package> <package> <type>rpm</type> - <name>ganglia-gmond</name> + <name>ganglia-gmond-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>ganglia-gmond-modules-python</name> + <name>ganglia-gmond-modules-python-3.5.0-99</name> </package> </packages> </osSpecific> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/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 c2626ac..03f0276 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 @@ -47,19 +47,19 @@ </package> <package> <type>rpm</type> - <name>nagios-plugins</name> + <name>nagios-plugins-1.4.9</name> </package> <package> <type>rpm</type> - <name>nagios</name> + <name>nagios-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>nagios-www</name> + <name>nagios-www-3.5.0-99</name> </package> <package> <type>rpm</type> - <name>nagios-devel</name> + <name>nagios-devel-3.5.0-99</name> </package> <package> <type>rpm</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml index 53b5d47..2142f24 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0/repos/repoinfo.xml @@ -22,11 +22,6 @@ <repoid>HDP-2.0</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="redhat5"> <repo> @@ -34,11 +29,6 @@ <repoid>HDP-2.0</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="suse11"> <repo> @@ -46,10 +36,5 @@ <repoid>HDP-2.0</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/1830dcf6/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml index e44f1f7..5903ccd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/repos/repoinfo.xml @@ -23,11 +23,6 @@ <repoid>HDP-2.1</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="redhat5"> <repo> @@ -35,11 +30,6 @@ <repoid>HDP-2.1</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos5</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="suse11"> <repo> @@ -47,11 +37,6 @@ <repoid>HDP-2.1</repoid> <reponame>HDP</reponame> </repo> - <repo> - <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.17/repos/suse11</baseurl> - <repoid>HDP-UTILS-2.1</repoid> - <reponame>HDP-UTILS</reponame> - </repo> </os> <os type="debian12"> <repo>
