Merge commit 'c01284f' into bfgminer

Conflicts:
	example.conf
	miner.c

README

@@ -153,8 +153,7 @@ Options for both config file and command line:
 --quiet|-q          Disable logging output, display status and errors
 --real-quiet        Disable all output
 --remove-disabled   Remove disabled devices entirely, as if they didn't exist
---retries|-r <arg>  Number of times to retry before giving up, if JSON-RPC call fails (-1 means never) (default: -1)
---retry-pause|-R <arg> Number of seconds to pause, between retries (default: 5)
+--retries <arg>     Number of times to retry failed submissions before giving up (-1 means never) (default: -1)
 --rotate <arg>      Change multipool strategy from failover to regularly rotate at N minutes (default: 0)
 --round-robin       Change multipool strategy from failover to round robin on failure
 --scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: 60)

example.conf

@@ -33,7 +33,6 @@
 "gpu-threads" : 2,
 "log" : 5,
 "queue" : 1,
-"retry-pause" : 5,
 "scan-time" : 60,
 "temp-hysteresis" : 3,
 

miner.c

@@ -974,10 +974,10 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITHOUT_ARG("--remove-disabled",
 		     opt_set_bool, &opt_removedisabled,
 	         "Remove disabled devices entirely, as if they didn't exist"),
-	OPT_WITH_ARG("--retries|-r",
+	OPT_WITH_ARG("--retries",
 		     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",
+	OPT_WITH_ARG("--retry-pause",
 		     set_null, NULL, NULL,
 		     opt_hidden),
 	OPT_WITH_ARG("--rotate",