svn commit: r1479994 - in /incubator/ambari/trunk: CHANGES.txt ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java

[swagle]

Author: swagle
Date: Tue May  7 18:04:50 2013
New Revision: 1479994

URL: http://svn.apache.org/r1479994
Log:
AMBARI-2088. Cluster installation times out at server side too fast. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1479994&r1=1479993&r2=1479994&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May  7 18:04:50 2013
@@ -830,6 +830,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2088. Cluster installation times out at server side too fast. (swagle)
+
  AMBARI-2083. Upgrade fails on Sles. (smohanty)
 
  AMBARI-2082. Oozie service check fails. (jaimin)

Modified: 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java?rev=1479994&r1=1479993&r2=1479994&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 Tue May  7 18:04:50 2013
@@ -81,7 +81,7 @@ public class ControllerModule extends Ab
     bind(Clusters.class).to(ClustersImpl.class);
     bind(ActionDBAccessor.class).to(ActionDBAccessorImpl.class);
     bindConstant().annotatedWith(Names.named("schedulerSleeptime")).to(10000L);
-    bindConstant().annotatedWith(Names.named("actionTimeout")).to(300000L);
+    bindConstant().annotatedWith(Names.named("actionTimeout")).to(600000L);
     bind(AmbariManagementController.class)
         .to(AmbariManagementControllerImpl.class);
     bind(HBaseMasterPortScanner.class).in(Singleton.class);