keorn fd6900bbb3 Merge remote-tracking branch 'parity/master' into bft ...

Conflicts:
	Cargo.lock

2016-09-27 12:37:43 +02:00

..

basic_authority.rs

Enable sealing if Engine provides internal sealing given author (#2084)

2016-09-15 12:12:15 +02:00

instant_seal.rs

Enable sealing if Engine provides internal sealing given author (#2084)

2016-09-15 12:12:15 +02:00

mod.rs

Merge remote-tracking branch 'parity/master' into bft

2016-09-27 12:37:43 +02:00

null_engine.rs

ethkey and ethstore use hash structures from bigint (#1851)

2016-08-15 15:09:00 +02:00

propose_collect.rs

fix propose collect locking

2016-09-05 17:06:43 +02:00

signed_vote.rs

add rounds check, simplify tests

2016-08-26 19:27:50 +02:00

tendermint.rs

adjust default timeouts

2016-09-08 10:31:46 +02:00