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

[#372,!181] hammer: reduced line lenghts, added docstrings, unified naming, fixed terminating timed out process

- added comments and documentation,
- added missing passing env to execute calls,
- fixed checking revision,
- removed unnecessary code

- added sql script for mysql used on debian 9 to fix MariaDB issue
- added enabling kea-shell feature
- removed hack for detecting boost on FreeBSD as it is fixed in Kea now

hammer: fixed conflict when hammer is used from 2 repo folders on the same computer, added jobs switch for forcing number of parallel compilation processes

hammer: added handling much more things (more systems, running unit tests with mysql, pgsql and cql)

    Merge branch '101-cb-add-two-step-configuration-to-the-dhcpv4-server-4'