Merge branch 'dev' into libpq

This commit is contained in:
Grant Limberg 2018-09-28 10:56:40 -07:00
commit c1ea1329c1
4 changed files with 22 additions and 38 deletions

View file

@ -1043,6 +1043,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE(
json network,member;
_db->get(nwid,network,address,member);
_db->eraseMember(nwid, address);
{
std::lock_guard<std::mutex> l(_memberStatus_l);