diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-01-12 09:49:11 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-01-12 09:49:11 -0800 |
| commit | fbc6ca28b7ee0b5d9917cdf6f7251e65dbb0d3ee (patch) | |
| tree | 56787fd56d1fdafeabeb2e82e9bb3d8174f57468 /node/Network.cpp | |
| parent | 72f926dc41bed699f6510a273f5ebbe30d84f755 (diff) | |
| parent | eab3ca1401b083b3d91d30d2c6f571dcb5c8a2a6 (diff) | |
| download | infinitytier-fbc6ca28b7ee0b5d9917cdf6f7251e65dbb0d3ee.tar.gz infinitytier-fbc6ca28b7ee0b5d9917cdf6f7251e65dbb0d3ee.zip | |
Merge branch 'adamierymenko-dev' of ssh://earth.zerotier.net:55522/git/ZeroTierOne into adamierymenko-dev
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index df741026..aac8d5d6 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -274,7 +274,7 @@ int Network::setConfiguration(const Dictionary &conf,bool saveToDisk) { Mutex::Lock _l(_lock); if ((_config)&&(*_config == *newConfig)) - return 1; // OK but duplicate + return 1; // OK config, but duplicate of what we already have } if (applyConfiguration(newConfig)) { if (saveToDisk) { |