Merge branch 'cgminer' into HEAD

Conflicts:
	README
	miner.c

README

@@ -135,6 +135,7 @@ Options for both config file and command line:
 --compact           Use compact display without per device statistics
 --debug|-D          Enable debug output
 --debuglog          Enable debug logging
+--disable-rejecting Automatically disable pools that continually reject shares
 --expiry|-E <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (w/o longpoll active) (default: 120)
 --expiry-lp <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (with longpoll active) (default: 3600)
 --failover-only     Don't leak work to backup pools when primary pool is lagging
@@ -146,7 +147,6 @@ Options for both config file and command line:
 --net-delay         Impose small delays in networking to not overload slow routers
 --no-gbt            Disable getblocktemplate support
 --no-longpoll       Disable X-Long-Polling support
---no-pool-disable   Do not automatically disable pools that continually reject shares
 --no-restart        Do not attempt to restart devices that hang
 --no-stratum        Disable Stratum detection
 --no-submit-stale   Don't submit shares if they are detected as stale

miner.c

@@ -172,7 +172,7 @@ int opt_api_port = 4028;
 bool opt_api_listen;
 bool opt_api_network;
 bool opt_delaynet;
-bool opt_disable_pool = true;
+bool opt_disable_pool;
 char *opt_icarus_options = NULL;
 char *opt_icarus_timing = NULL;
 bool opt_worktime;
@@ -1144,6 +1144,9 @@ static struct opt_table opt_config_table[] = {
 			opt_hidden
 #endif
 	),
+	OPT_WITHOUT_ARG("--disable-rejecting",
+			opt_set_bool, &opt_disable_pool,
+			"Automatically disable pools that continually reject shares"),
 #if defined(WANT_CPUMINE) && (defined(HAVE_OPENCL) || defined(USE_FPGA))
 	OPT_WITHOUT_ARG("--enable-cpu|-C",
 			opt_set_bool, &opt_usecpu,
@@ -1247,7 +1250,7 @@ static struct opt_table opt_config_table[] = {
 #else
 			opt_hidden
 #endif
-	),
+			),
 	OPT_WITHOUT_ARG("--no-gbt",
 			opt_set_invbool, &want_gbt,
 			"Disable getblocktemplate support"),
@@ -1256,7 +1259,7 @@ static struct opt_table opt_config_table[] = {
 			"Disable X-Long-Polling support"),
 	OPT_WITHOUT_ARG("--no-pool-disable",
 			opt_set_invbool, &opt_disable_pool,
-			"Do not automatically disable pools that continually reject shares"),
+			opt_hidden),
 	OPT_WITHOUT_ARG("--no-restart",
 			opt_set_invbool, &opt_restart,
 			"Do not attempt to restart devices that hang"