diff options
| author | Joseph Henry <josephjah@gmail.com> | 2019-06-12 13:14:23 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2019-06-12 13:14:23 -0700 |
| commit | 94bd2918fac33a1bf5ef9ebc4cfe9b4e1709d0f4 (patch) | |
| tree | f0893a4811682fed6779ff5fe011f7d3319fb65b /controller/EmbeddedNetworkController.cpp | |
| parent | c3bfcf560b1db720c9bb08021b50bd31094e737c (diff) | |
| parent | 5b2b0887141da25c290608632c2e609764abbf73 (diff) | |
| download | infinitytier-94bd2918fac33a1bf5ef9ebc4cfe9b4e1709d0f4.tar.gz infinitytier-94bd2918fac33a1bf5ef9ebc4cfe9b4e1709d0f4.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'controller/EmbeddedNetworkController.cpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index cc012929..99c664f0 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -1053,7 +1053,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE( json network,member; _db->get(nwid,network,address,member); - _db->eraseMember(nwid, address); + _db->eraseMember(nwid, address); { std::lock_guard<std::mutex> l(_memberStatus_l); |