Luke Dashjr
|
e045c656eb
Semi-Merge commit '35d18e8' into cg_merges_20121215
|
13 years ago |
Luke Dashjr
|
7760aa78a2
Revert "RPC: Remove "Bytes Recv" since it is incorrect"
|
13 years ago |
Luke Dashjr
|
0654f2a1cb
Merge branch 'bytessentrcvd' into bfgminer
|
13 years ago |
Luke Dashjr
|
50152024eb
Bugfix: Hook CURLOPT_DEBUGFUNCTION to count actual bytes sent/received by libcurl
|
13 years ago |
Luke Dashjr
|
202c9c4351
Merge commit '98c179c' into bfgminer
|
13 years ago |
Luke Dashjr
|
98c179c07e
Bugfix: Reset pool transparency_time when connecting to stratum
|
13 years ago |
Luke Dashjr
|
d9ef0c0830
Merge commit '02d4a94' into bfgminer
|
13 years ago |
Luke Dashjr
|
02d4a94465
Bugfix: Immediately discard shares found on disconnected stratum pools, since there is no way to submit them
|
13 years ago |
Luke Dashjr
|
e170fa3d1b
Merge commit 'd951da2' into bfgminer
|
13 years ago |
Luke Dashjr
|
d951da2ba8
Bugfix: Decrement total_submitting when stale shares are discarded before any submission attempts
|
13 years ago |
Luke Dashjr
|
05223c3301
Merge commit '87059e4' into bfgminer
|
13 years ago |
Luke Dashjr
|
87059e4943
Bugfix: Only try to compare stratum job_id for work that has a job_id (ie, ones that came from stratum)
|
13 years ago |
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 |