9 Commits

Author	SHA1	Message	Date
amalraj.manigmail.com	72270b10c7	Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12 ... # Conflicts: # .travis.yml # README.md # cmd/geth/genesis_test.go # core/genesis.go # core/genesis_test.go # core/state_processor.go # eth/config.go # eth/downloader/downloader_test.go # eth/protocol_test.go # params/config.go	2018-09-27 18:55:55 +08:00
Trung Nguyen	7af7d8cfef	avoid growing backlogs when valSet changes	2018-09-05 17:22:42 -04:00
Qvintvs	a67eccbcd8	debug tests	2018-06-01 12:51:35 +08:00
Qvintvs	622e98ad51	debug merge attempt	2018-05-31 14:21:16 +08:00
Patrick Mylund Nielsen	bbc8e726e5	Merge pull request #270 from getamis/feature/update_istanbul ... consensus, core, eth, miner, params: update istanbul engine	2018-02-27 20:57:21 -05:00
mark.lin	51c5e2cb30	consensus/istanbul: set header timestamp in Prepare()	2018-02-27 14:52:13 +08:00
mark.lin	f7b063302d	cmd, consensus: remove BlockPauseTime flag	2018-02-27 14:52:03 +08:00
mark.lin	9ac24f9aaa	consensus, core, eth, miner, params: update istanbul engine	2018-01-31 10:27:08 +08:00
Patrick Mylund Nielsen	3d91976f08	Geth 1.7.2 rebase and addition of Istanbul BFT (#207)	2017-10-31 18:24:11 -04:00