summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-21 13:15:09 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-21 13:15:09 -0800
commit536b7000bc4f281d73f9066cb2cd16211fb8d390 (patch)
tree1545afb34f743711234b81ded85fa6c5e666bccd
parent24cc0904fa08e655030ea90e374ff24315f1029a (diff)
parent5a65463b92a8f735a29994bfd06d802a36ff0807 (diff)
downloadinfinitytier-536b7000bc4f281d73f9066cb2cd16211fb8d390.tar.gz
infinitytier-536b7000bc4f281d73f9066cb2cd16211fb8d390.zip
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
-rw-r--r--netcon/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/netcon/README.md b/netcon/README.md
index 978d237f..99ceda62 100644
--- a/netcon/README.md
+++ b/netcon/README.md
@@ -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")