Change orte_startup_timeout to be in seconds and remove the 10 second maximum

This commit was SVN r27741.

orte/mca/plm/base/plm_base_launch_support.c

@@ -493,7 +493,7 @@ void orte_plm_base_launch_apps(int fd, short args, void *cbdata)
      * defined time, then we know things have failed
      */
     if (0 < orte_startup_timeout) {
-        ORTE_DETECT_TIMEOUT(orte_startup_timeout, 1000, 10000000, timer_cb, jdata);
+        ORTE_DETECT_TIMEOUT(orte_startup_timeout, 1000000, 0, timer_cb, jdata);
     }
 
     /* cleanup */

orte/runtime/orte_mca_params.c

@@ -252,7 +252,7 @@ int orte_register_params(void)
                                 false, false, 0, &orted_debug_failure_delay);
 
     mca_base_param_reg_int_name("orte", "startup_timeout",
-                                "Milliseconds/daemon to wait for startup before declaring failed_to_start (default: 0 => do not check)",
+                                "Seconds/daemon to wait for startup before declaring failed_to_start (default: 0 => do not check)",
                                 false, false, 0, &orte_startup_timeout);
  
     /* check for timing requests */
@@ -469,12 +469,6 @@ int orte_register_params(void)
                                 false, false,
                                 (int) false, &value);
     orte_report_launch_progress = OPAL_INT_TO_BOOL(value);
-    if (orte_report_launch_progress) {
-        /* ensure the startup timeout is set to something reasonable */
-        if (0 == orte_startup_timeout) {
-            orte_startup_timeout = 2000;  /* default to 2 seconds */
-        }
-    }
     
     /* cluster hardware info detected by orte only */
     mca_base_param_reg_string_name("orte", "cpu_type",