incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject svn commit: r1339995 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/html/clusters.php hmc/js/clustersList.js hmc/php/frontend/uninstallCleanup.php
Date Fri, 18 May 2012 06:25:56 GMT
Author: hitesh
Date: Fri May 18 06:25:56 2012
New Revision: 1339995

URL: http://svn.apache.org/viewvc?rev=1339995&view=rev
Log:
AMBARI-287. Add link to uninstall on index page. Contributed by Vikram

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/html/clusters.php
    incubator/ambari/branches/ambari-186/hmc/js/clustersList.js
    incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339995&r1=1339994&r2=1339995&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 18 06:25:56 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-287. Add link to uninstall on index page. (Vikram via hitesh)
+
   AMBARI-285. Clean up Add Hosts page. (Yusako Sako via hitesh)
 
   AMBARI-284. Define service groups in nagios such that users can more easily

Modified: incubator/ambari/branches/ambari-186/hmc/html/clusters.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/clusters.php?rev=1339995&r1=1339994&r2=1339995&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/clusters.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/clusters.php Fri May 18 06:25:56 2012
@@ -39,7 +39,7 @@
               </a>
             </li>
             <li class="clustersNavigationLinkEntry">
-              <a href="../html/uninstallCluster.php?clusterName=<?php echo $_GET['clusterName'];
?>">
+              <a href="../html/uninstallWizard.php?clusterName=<?php echo $_GET['clusterName'];
?>">
                 Uninstall
               </a>
             </li>

Modified: incubator/ambari/branches/ambari-186/hmc/js/clustersList.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/clustersList.js?rev=1339995&r1=1339994&r2=1339995&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/clustersList.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/clustersList.js Fri May 18 06:25:56 2012
@@ -66,6 +66,7 @@ function renderClusterList(Y) {
                                      '<label>Actions</label>' +
                                      '<a class="btn" href="manageServices.php?clusterName='
+ clusterName + '" id="existingClusterLinkDivId">Manage services</a>' +
                                      '<a class="btn" style="margin-left:10px" href="addNodesWizard.php?clusterName='
+ clusterName + '">Add slave nodes to cluster</a>' +
+                                     '<a class="btn" style="margin-left:10px" href="uninstallWizard.php?clusterName='
+ clusterName + '">Uninstall cluster</a>' +
                                    '</div>' +
                                  '</div>';
           }

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php?rev=1339995&r1=1339994&r2=1339995&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstallCleanup.php Fri May 18
06:25:56 2012
@@ -107,9 +107,11 @@ function deBootStrap ($clusterName, $dep
 
     $allDone = true;
   }
-
   /////// done monitoring return back to the uninstall
   
+  // need to cleanup db for this cluster
+  $dbAccessor->deleteCluster($clusterName);
+  
   return array('result' => 0);
 }
 



Mime
View raw message