Luke Dashjr
|
65f4b488d5
Null-Merge commit 'c70a265' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
cade98b1da
Merge commit '0c41b1b' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
3dbf3b0c9a
Merge commit '2b5467c' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
7f8359621c
Merge commit 'c5d9f3a' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
192e7a5f17
Merge commit '43be78c' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
215c6802cf
Merge commit '40f5362' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
971e7a27ee
Merge commit '031ba75' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
1f020d34e5
Merge commit '383b42f' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
228151f3c0
Null-Merge commit '8feb302' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
a4110aed1d
Merge branch 'submit_async2' into bfgminer
|
13 years ago |
Luke Dashjr
|
df505a2f12
Suppress warning about "succeeded" not being used in finish_req_in_progress for now
|
13 years ago |
Luke Dashjr
|
25ccb5e2ea
Bugfix: Always give the get_work thread a curl, regardless of other outstanding curls in use
|
13 years ago |
Luke Dashjr
|
43ff9fbe9c
Bugfix: Failover after even a single job-request failure (or else it takes too long on timeouts)
|
13 years ago |
Luke Dashjr
|
88afbe9c26
Bugfix: Need to remove and re-add curl easy handles from multi to start a new request
|
13 years ago |
Luke Dashjr
|
defd976edb
Access total_submitting under mutex lock to avoid any potential races, and increment it as soon as we queue the submission up
|
13 years ago |
Luke Dashjr
|
202763a460
Just leave the submit_work thread running persistently
|
13 years ago |
Con Kolivas
|
c70a2658c8
Merge pull request #353 from kanoi/api
|
13 years ago |
Kano
|
f19b03c812
mmq - abbreviate the temperature numbers
|
13 years ago |
Con Kolivas
|
0c41b1b2da
Merge branch 'master' of github.com:ckolivas/cgminer
|
13 years ago |
Con Kolivas
|
f3b96b8d26
Do not do any setup if opt_api_listen is disabled in api.c.
|
13 years ago |
Con Kolivas
|
634958ff1c
Merge pull request #352 from kanoi/api
|
13 years ago |
Kano
|
e6efec46e9
usbutils.c uninitialised usbstat for non-primary mmqs
|
13 years ago |
Con Kolivas
|
2b5467c44c
Merge branch 'master' of github.com:ckolivas/cgminer
|
13 years ago |
Con Kolivas
|
c5d9f3ac60
Only set the lagging flag for select_pool() on failed getwork if we're not in opt_fail_only mode.
|
13 years ago |
Con Kolivas
|
6d848e27b2
Merge pull request #351 from denis2342/ztex
|
13 years ago |
Denis Ahrens
|
0559d0bb6a
libztex: in case the selectFpga() failed set the selected fpga to unknown
|
13 years ago |
Luke Dashjr
|
d6b71382f9
Merge commit 'ab0e800' into bfgminer
|
13 years ago |
Luke Dashjr
|
ab0e800a1c
Bugfix: Restore work->pool after prepare_rpc_req since clean_work now clears it
|
13 years ago |
Con Kolivas
|
43be78cca5
Merge pull request #350 from sharky112065/master
|
13 years ago |
sharky112065
|
ccbe0e6672
Modified windows-build.txt to update git instructions.
|
13 years ago |