[master] Merge branch 'trac3279'
Conflicts: src/lib/dhcp/iface_mgr.cc src/lib/dhcp/iface_mgr.h src/lib/dhcp/tests/iface_mgr_unittest.cc
Please register or sign in to comment
Conflicts: src/lib/dhcp/iface_mgr.cc src/lib/dhcp/iface_mgr.h src/lib/dhcp/tests/iface_mgr_unittest.cc