GitLab

src/lib/dhcpsrv/cfg_shared_networks.*
    CfgSharedNetworks4::merge() - new method to merge
    shared network configs

src/lib/dhcpsrv/cfg_subnets4.*
    CfgSubnets4::merge() - reworked to reflect new rules

src/lib/dhcpsrv/srv_config.cc
    SrvConfig::merge() - now merges shared networks

src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
    checkMergedSubnet() - convenience function for
    verifying subnet content

    TEST(CfgSubnets4Test, mergeSubnets) - revamped to
    reflect new network assigment rules

src/bin/dhcp4/tests/config_backend_unittest.cc
    TEST_F(Dhcp4CBTest, mergeSharedNetworks)  - enabled test

 - comments in StatsMgr improved
 - added unit-test for CfgMgr::clear() and stats
 - copyright years updated

 - {update,remove}Statistics moved from CfgMgr to SrvConfig,CfgSubnets4

Added @todos to the selectSubnet methods of CfgSubnets4 and CfgSubnets6.

Also, removed unused headers from cfg_subnets4.h.