ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347368 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/puppet/genmanifest/generateManifest.php hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp hmc/puppet/modules/hdp/manifests/params.pp
Date Thu, 07 Jun 2012 03:49:25 GMT
Author: vikram
Date: Thu Jun  7 03:49:25 2012
New Revision: 1347368

URL: http://svn.apache.org/viewvc?rev=1347368&view=rev
Log:
AMBARI-511. Fix for previous patch. (Contributed by Jitendra)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347368&r1=1347367&r2=1347368&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 03:49:25 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-511. Fix for previous patch (Jitendra via Vikram)
+
   AMBARI-516. Fix epel install to be using curl calls. (Mahadev via Vikram)
 
   AMBARI-513. Fix for previous patch (Ramya via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php?rev=1347368&r1=1347367&r2=1347368&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php Thu
Jun  7 03:49:25 2012
@@ -213,8 +213,8 @@ include "RoleDependencies.php";
      "hdp-hbase::regionserver" => "hbase",
      "hdp-hbase::client" => "hbase",
      "hdp-pig" => "pig.noarch",
-     "hdp-sqoop" => "sqoop mysql-connector-java-5.0.8-4.jpp5",
-     "hdp-hive::server" => "hive mysql-connector-java-5.0.8-4.jpp5",
+     "hdp-sqoop" => "sqoop mysql-connector-java-5.0.8-1",
+     "hdp-hive::server" => "hive mysql-connector-java-5.0.8-1",
      "hdp-hive::client" => "hive",
      "hdp-hcat" => "hcatalog",
      "hdp-oozie::server" => "oozie.noarch extjs-2.2-1",

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp?rev=1347368&r1=1347367&r2=1347368&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
Thu Jun  7 03:49:25 2012
@@ -8,9 +8,9 @@ class hdp-sqoop::mysql-connector()
 
   anchor { 'hdp-sqoop::mysql-connector::begin':}
 
-   hdp::exec { 'yum install -y mysql-connector-java-5.0.8-4.jpp5':
-       command => "yum install -y mysql-connector-java-5.0.8-4.jpp5",
-       unless  => "rpm -qa | grep mysql-connector-java-5.0.8-4.jpp5",
+   hdp::exec { 'yum install -y mysql-connector-java-5.0.8-1':
+       command => "yum install -y mysql-connector-java-5.0.8-1",
+       unless  => "rpm -qa | grep mysql-connector-java-5.0.8-1",
        path    => ["/bin","/usr/bin/"],
        require   => Anchor['hdp-sqoop::mysql-connector::begin']
    }
@@ -20,7 +20,7 @@ class hdp-sqoop::mysql-connector()
        unless  => "test -f ${target}",
        creates => $target,
        path    => ["/bin","/usr/bin/"],
-       require => Hdp::Exec['yum install -y mysql-connector-java-5.0.8-4.jpp5'],
+       require => Hdp::Exec['yum install -y mysql-connector-java-5.0.8-1'],
        notify  =>  Anchor['hdp-sqoop::mysql-connector::end'],
    }
 

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp?rev=1347368&r1=1347367&r2=1347368&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp Thu Jun
 7 03:49:25 2012
@@ -216,7 +216,7 @@ class hdp::params()
       32 =>  ['mysql','mysql-server']
   },
     mysql-connector => {
-      64 =>  ['mysql-connector-java-5.0.8-4.jpp5']
+      64 =>  ['mysql-connector-java-5.0.8-1']
   },
     extjs => {
       64 =>  ['extjs-2.2-1']



Mime
View raw message