Merge branch 'develop' into 864-distinguish-between-seeds-and-manual-peers

Browse Source

...

This commit is contained in:

Ethan Buchman

2018-01-13 14:34:32 -05:00

parent 075ae1e301 a13b17ec6c

commit e6b70baae0

27 changed files with 494 additions and 164 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

test/p2p/data/mach1/core/genesis.json → test/p2p/data/mach1/core/config/genesis.json

0

test/p2p/data/mach1/core/priv_validator.json → test/p2p/data/mach1/core/config/priv_validator.json

0

test/p2p/data/mach2/core/genesis.json → test/p2p/data/mach2/core/config/genesis.json

0

test/p2p/data/mach2/core/priv_validator.json → test/p2p/data/mach2/core/config/priv_validator.json

0

test/p2p/data/mach3/core/genesis.json → test/p2p/data/mach3/core/config/genesis.json

0

test/p2p/data/mach3/core/priv_validator.json → test/p2p/data/mach3/core/config/priv_validator.json

0

test/p2p/data/mach4/core/genesis.json → test/p2p/data/mach4/core/config/genesis.json

0

test/p2p/data/mach4/core/priv_validator.json → test/p2p/data/mach4/core/config/priv_validator.json