svn commit: r1347303 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/html/head.inc

[vi...@apache.org]

Author: vikram
Date: Thu Jun  7 02:17:44 2012
New Revision: 1347303

URL: http://svn.apache.org/viewvc?rev=1347303&view=rev
Log:
AMBARI-482. Show the same welcome page to the user if the user starts configuring a cluster but has not started deploy yet (Contributed by Yusaku)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/html/head.inc

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347303&r1=1347302&r2=1347303&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 02:17:44 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-482. Show the same welcome page to the user if the user starts configuring a cluster but has not started deploy yet (Yusaku via Vikram)
+
   AMBARI-481. Units of various config values not displayed on review and deploy page (Yusaku via Vikram)
 
   AMBARI-480. Reduce Page Load Time By Combining HMC JS Files (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/html/head.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/head.inc?rev=1347303&r1=1347302&r2=1347303&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/head.inc (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/head.inc Thu Jun  7 02:17:44 2012
@@ -69,8 +69,8 @@ if (sizeof($clusters) == 0) {
         }
         break;
       case 'CONFIGURATION_IN_PROGRESS':
-        if (!$bypassRouter && $requestPage != 'reinstall.php' && $requestPage != 'initializeCluster.php') {
-          eval(redirectToPage($requestPage, 'reinstall.php'));
+        if (!$bypassRouter && $requestPage != 'welcome.php' && $requestPage != 'initializeCluster.php') {
+          eval(redirectToPage($requestPage, 'welcome.php'));
           exit;
         }
         $clusterState = 'CONFIGURATION_IN_PROGRESS';