Merge commit '8fc701d' into bfgminer

Conflicts:
	miner.c

miner.c

@@ -978,8 +978,8 @@ static struct opt_table opt_config_table[] = {
 		     opt_set_intval, opt_show_intval, &opt_retries,
 		     "Number of times to retry failed submissions before giving up (-1 means never)"),
 	OPT_WITH_ARG("--retry-pause|-R",
-		     set_int_0_to_9999, opt_show_intval, &opt_fail_pause,
-		     "Number of seconds to pause, between retries"),
+		     set_null, NULL, NULL,
+		     opt_hidden),
 	OPT_WITH_ARG("--rotate",
 		     set_rotate, opt_show_intval, &opt_rotate_period,
 		     "Change multipool strategy from failover to regularly rotate at N minutes"),
@@ -3858,8 +3858,8 @@ static void set_options(void)
 retry:
 	wlogprint("\n[L]ongpoll: %s\n", want_longpoll ? "On" : "Off");
 	wlogprint("[Q]ueue: %d\n[S]cantime: %d\n[E]xpiry: %d\n[R]etries: %d\n"
-		  "[P]ause: %d\n[W]rite config file\n[B]FGMiner restart\n",
-		opt_queue, opt_scantime, opt_expiry, opt_retries, opt_fail_pause);
+		  "[W]rite config file\n[B]FGMiner restart\n",
+		opt_queue, opt_scantime, opt_expiry, opt_retries);
 	wlogprint("Select an option or any other key to return\n");
 	input = getch();
 
@@ -3902,14 +3902,6 @@ retry:
 		}
 		opt_retries = selected;
 		goto retry;
-	} else if  (!strncasecmp(&input, "p", 1)) {
-		selected = curses_int("Seconds to pause before network retries");
-		if (selected < 1 || selected > 9999) {
-			wlogprint("Invalid selection\n");
-			goto retry;
-		}
-		opt_fail_pause = selected;
-		goto retry;
 	} else if  (!strncasecmp(&input, "w", 1)) {
 		FILE *fcfg;
 		char *str, filename[PATH_MAX], prompt[PATH_MAX + 50];