 Luke Dashjr
|
38f4659fb5
Semi-Merge commit '9fd60bb' into cg_merges_20121226 (just add checking staged_rollable inside stgd_lock)
|
13 years ago |
|
Luke Dashjr
|
13029f8e1d
Merge commit 'd91dc18' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
aa17f0c746
Merge commit 'a1d6abc' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
05aa885c84
Merge branch 'gbt_eff' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
9e69c4c58e
Bugfix: Update last GBT work in pool_active before staging it, since otherwise it could possibly be consumed before we copy it
|
13 years ago |
|
Luke Dashjr
|
f1b647e481
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3895928811
Bugfix: Address Windows-specific formatting issues (including lack of support for %ll*)
|
13 years ago |
|
Luke Dashjr
|
3ac7f71f39
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
18e0e8bdd4
Follow strict time_t handling rules
|
13 years ago |
|
Luke Dashjr
|
d36932170a
Merge branch 'submit_async' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
93d9cc8d9f
Bugfix: submissions: Skip FD_ISSET when fd==-1 (let the next select setup deal with cleaning them out)
|
13 years ago |
|
Luke Dashjr
|
53f347cbff
Merge commit 'ac55fb0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ac55fb0c25
Bugfix: Remove sws from write_sws list when discarding it due to pre-send stratum disconnection
|
13 years ago |
|
Luke Dashjr
|
d986d4ee80
Merge branch 'cgminer' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
7b291da674
Merge commit 'a07e015' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
6d70c591fa
Merge commit 'a7128e0' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
f7f1b0c3be
Merge commit '4f1f5c8' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
2c73e271fc
Merge commit '1926790' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
410ef0ff1a
Merge commit '14457a0' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
9a343919f3
Merge commit '3b91033' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
bf040338ec
Merge commit '9ef73d9' into cg_merges_20121217
|
13 years ago |
|
Luke Dashjr
|
9e376e009e
Merge branch 'bandwidth_eff' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c98301ebcf
Move new bandwidth-based Efficiency to status line
|
13 years ago |
|
Luke Dashjr
|
f220a1c5cd
Merge commit 'cdde52d' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cdde52dec9
Bugfix: Pull out GBT request collapsing since it is no longer needed with new get_work main loop
|
13 years ago |
|
Luke Dashjr
|
b2d2f303ad
Merge commit 'ef7f7c1' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ef7f7c1206
Bugfix: Free unused work when waiting on external GBT request
|
13 years ago |
|
Luke Dashjr
|
9fc5e07358
Merge commit '7320365' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7320365947
Bugfix: Free shares discarded before beginning submission
|
13 years ago |
|
Luke Dashjr
|
43a52f3cf3
Merge commit 'c1ce0eb' into bfgminer
|
13 years ago |
