quorum

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
Nguyen Kien Trung	f13b6aad4f	Travis an unit test fixes (#519 ) * Used Tessera as a fall back when Constellation is not available in the host * Used OSX 10.12 instead of 10.13 to avoid Kernel Extension Consent which is not available in CI environment. Can revert back once Travis CI has ability to disable the consent * Merged upstream PR/Code to fix tests which have intermittent failures * Cleaned up .travis.yml build matrix	2018-09-11 11:25:24 -04: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