-
Tomek Mrugalski authored
Conflicts: ChangeLog src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp6/dhcp6_srv.cc src/lib/dhcp/iface_mgr.cc src/lib/dhcp/iface_mgr.h src/lib/dhcp/tests/iface_mgr_unittest.cc
d82df10e
Conflicts: ChangeLog src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp6/dhcp6_srv.cc src/lib/dhcp/iface_mgr.cc src/lib/dhcp/iface_mgr.h src/lib/dhcp/tests/iface_mgr_unittest.cc