Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

This commit is contained in:
Adam Ierymenko 2015-12-21 13:15:09 -08:00
commit 536b7000bc

View File

@ -170,7 +170,7 @@ To run unit tests:
cp /tmp/netcon_first/identity.secret ./netcon/docker-test/netcon_identity.secret
cp /tmp/netcon_second/identity.public ./netcon/docker-test/monitor_identity.public
cp /tmp/netcon_second/secret.private ./netcon/docker-test/monitor_identity.secret
cp /tmp/netcon_second/secret.secret ./netcon/docker-test/monitor_identity.secret
4) Place a blank network config file in the *netcon/docker-test* directory (e.g. "8056c2e21c000001.conf")