 Luke Dashjr
|
1f594397df
Merge branch 'bugfix_stratum_failover2' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
b04f3c8810
Bugfix: Recheck has_stratum even if the pool hasn't changed, in case pool has switched to another protocol in the process; also only delay 5 seconds before retry if pool is the same
|
13 years ago |
|
Luke Dashjr
|
6b8e7f511d
Merge branch 'bugfix_stratum_failover' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
dc66aa8701
Bugfix: Try GBT if no pool protocol is known (can occur in the process of stratum failover to GBT)
|
13 years ago |
|
Luke Dashjr
|
f21dfb7022
Merge branch 'bugfix_stratum_discards' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ce26b7f170
Bugfix: Correctly track discarded stratum shares, and log them as "disconnect" in sharelog
|
13 years ago |
|
Luke Dashjr
|
3539af676c
Merge branch 'cg_merges_20121214' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
846f65f8cf
NEWS: BFGMiner update
|
13 years ago |
|
Luke Dashjr
|
0156ec0a1b
Merge commit '8ed1e9d' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
e6e7f72792
Semi-Merge commit 'de8af8d' into cg_merges_20121214 (rejected diff1 additions and usbstats)
|
13 years ago |
|
Luke Dashjr
|
7f59550b5c
Merge commit 'cada0d3' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
2ee7d36fc3
Merge commit '2274af6' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
97250d3aad
Merge commit 'f66d59d' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
fab948c7f7
Null-Merge commit '6b6ff39' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
12a23da105
RPC: Remove "Bytes Recv" since it is incorrect
|
13 years ago |
|
Luke Dashjr
|
3d44c01692
Merge commit 'fd1bd9e' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
5039714e73
Null-Merge commit '05082c8' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
71ce61fa14
Merge commit 'c217f4c' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
b264093ea8
Merge commit '55fadb3' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
e9db761d1a
Null-Merge commit 'f36c7e6' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
6826651448
Merge commit '3e8f74c' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
ce8c5bed52
Merge commit 'd3aed9f' into cg_merges_20121214
|
13 years ago |
|
Luke Dashjr
|
f3a6d73832
Null-Merge commit '56801c6' into cg_merges_20121214
|
13 years ago |
 Con Kolivas
|
8ed1e9dd5e
Update NEWS.
|
13 years ago |
|
Con Kolivas
|
de8af8d0e7
Merge branch 'master' of github.com:ckolivas/cgminer
|
13 years ago |
|
Con Kolivas
|
cada0d3195
Check for EWOULDBLOCK when supported in send and recv as well.
|
13 years ago |
|
Con Kolivas
|
3c0d41469a
Merge pull request #367 from kanoi/minerphp
|
13 years ago |
|
Con Kolivas
|
2274af6a05
Use the raw send() command instead of curl_easy_send since curl raw socket usage introduces random bugs on windows.
|
13 years ago |
|
Con Kolivas
|
f66d59df03
Use raw recv() command in place of curl_easy_recv since the curl implementation introduces random bugs on windows builds when the recv fails.
|
13 years ago |
 Kano
|
a54a72c3f4
miner.php when displaying a single rig, add prev/next rig buttons if they exist, next to refresh
|
13 years ago |
