Gav Wood
|
6c1802e412
|
Allow configuration of when to reseal blocks.
|
2016-06-27 17:23:54 +02:00 |
|
Tomasz Drwięga
|
6bbaced3cd
|
Merge branch 'master' into miner-no-default
Conflicts:
ethcore/src/miner/miner.rs
parity/main.rs
|
2016-06-26 22:44:34 +02:00 |
|
Tomasz Drwięga
|
34c89e5841
|
fixing json_tests
|
2016-06-24 10:49:13 +02:00 |
|
Tomasz Drwięga
|
6edb981bfa
|
Merge branch 'master' into miner-no-default
Conflicts:
sync/src/lib.rs
|
2016-06-23 21:18:43 +02:00 |
|
Gav Wood
|
8fcec20398
|
Gas limit ceiling option.
|
2016-06-23 14:29:16 +02:00 |
|
Arkadiy Paronyan
|
b2891fcdda
|
Update sealing on new transactions (#1365)
|
2016-06-21 16:00:34 +02:00 |
|
Tomasz Drwięga
|
a2f24a0083
|
Removing Default from Miner
|
2016-06-20 10:28:38 +02:00 |
|
Gav Wood
|
bc5c3da2af
|
Merge branch 'vmtracing' into diffing
|
2016-06-02 12:28:09 +02:00 |
|
Gav Wood
|
26da38a439
|
Merge remote-tracking branch 'origin/master' into vmtracing
|
2016-06-02 11:40:39 +02:00 |
|
Nikolay Volf
|
1ef4db82e8
|
doctest fixes
|
2016-06-01 14:50:06 +02:00 |
|
Nikolay Volf
|
0c782bf34b
|
Merge branch 'master' into client-refact
|
2016-06-01 12:45:04 +02:00 |
|
Nikolay Volf
|
a845e08bc6
|
rename of the trait
|
2016-05-31 20:33:26 +02:00 |
|
Nikolay Volf
|
8e252d5f1b
|
refactored to merge client & client
|
2016-05-31 19:52:53 +02:00 |
|