 Luke Dashjr
|
e5f2ed1520
Merge commit '944af31' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
e06938c5bd
Tree-Merge commit 'eaa935b' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
1979ef5cfe
Null-Merge commit '1eac91f' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
7119479adc
Merge commit 'dd4e515' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
5e5adc12b8
Merge commit 'd3bfee1' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
0bcaea174a
Merge commit 'fedf0f1' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
de596cd6ff
Merge commit '98151b2' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
30175b568b
Merge commit 'f0c1782' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
74416e8514
Null-Merge commit 'f86e893' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
26ab99f224
Merge commit '61e86bb' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
3fc26f201f
Semi-Merge commit '93e3c16' into cg_merges_20121226 (mergability only)
|
13 years ago |
|
Luke Dashjr
|
4b868d2af1
Null-Merge commit '3487948' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
2cdd55b8dc
Merge commit 'deb9aec' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
6ddcf45c4e
Null-Merge commit '432bfd0' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
c59bb95807
Semi-Merge commit '54e218b' into cg_merges_20121226 (just mergability)
|
13 years ago |
|
Luke Dashjr
|
9db78d19b4
Null-Merge commit '69dd5af' into cg_merges_20121226
|
13 years ago |
|
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
|
b9dae6e3e3
Merge commit 'cdd0d' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cdd0d7d461
Add low-level debugging info for data_buffer (some only enabled with -DDEBUG_DATABUF)
|
13 years ago |
|
Luke Dashjr
|
2718fee2d9
Make all_data_cb fwrite-compliant by returning nmembs, and check for unlikely overflows
|
13 years ago |
|
Luke Dashjr
|
aa17f0c746
Merge commit 'a1d6abc' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
a1d6abca08
Bugfix: Need to do extract_sockaddr before trying to initiate stratum (erroneous http URI usage, except at startup)
|
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 |
 Con Kolivas
|
944af31b99
Parse anything in the stratum socket if it's full without waiting. Empty the socket even if a connection is not needed in case there are share returns.
|
13 years ago |
|
Con Kolivas
|
eaa935b193
Merge pull request #372 from denis2342/claim
|
13 years ago |
|
Con Kolivas
|
1eac91f171
Merge pull request #373 from csjones/master
|
13 years ago |
|
Con Kolivas
|
dd4e51594b
Provide a mechanism to zero all the statistics from the menu.
|
13 years ago |
|
Con Kolivas
|
d3bfee14b3
Display the current pool diff in the status line.
|
13 years ago |
