quorum/raft
amalraj.manigmail.com 4dbd95947d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:50 +08:00
..
api.go Feature/410/expose raft cluster api (#501) 2018-09-11 15:05:42 -04:00
backend.go Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 2019-01-29 19:08:50 +08:00
constants.go Dynamic raft membership support (#130) 2017-08-28 17:43:44 -04:00
events.go Add Raft-based consensus (#79) 2017-03-23 13:41:02 -05:00
handler.go Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 2019-01-29 19:08:50 +08:00
listener.go Add Raft-based consensus (#79) 2017-03-23 13:41:02 -05:00
minter.go Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 16:57:27 +08:00
minter_test.go Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 17:56:02 +08:00
peer.go Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 2019-01-29 19:08:50 +08:00
persistence.go Geth 1.7.2 rebase and addition of Istanbul BFT (#207) 2017-10-31 18:24:11 -04:00
snapshot.go Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18 2019-01-29 19:08:50 +08:00
speculative_chain.go Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new 2018-10-04 16:21:20 +08:00
util.go Geth 1.7.2 rebase and addition of Istanbul BFT (#207) 2017-10-31 18:24:11 -04:00
wal.go Geth 1.7.2 rebase and addition of Istanbul BFT (#207) 2017-10-31 18:24:11 -04:00