5 Commits

Author	SHA1	Message	Date
amalraj.manigmail.com	fcfc7b6d45	merge with quorum upstream master	2018-10-09 16:01:11 +08:00
Jitendra Bhurat	2ad2e0b4bf	Added a validateConsensus() which exits geth if no consensus is speci… (#540) ... Validate for a Quorum supported consensus and exit if no consensus is specified.	2018-10-01 16:39:01 -04:00
Qvintvs	622e98ad51	debug merge attempt	2018-05-31 14:21:16 +08:00
Qvintvs	4b44bea1d7	Merge attempt	2018-05-31 14:16:44 +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