-
Thomas Markwalder authored
src/bin/dhcp4/json_config_parser.* Moved global merge logic into SrvConfig src/lib/dhcpsrv/srv_config.* SrvConfig::merge(const ConfigBase& other) - now calls protocol specific merge methods SrvConfig::merge4() - new method for v4 merges SrvConfig::mergeGlobals4() - new method for merging v4 globals src/lib/dhcpsrv/tests/srv_config_unittest.cc TEST_F(SrvConfigTest, mergeGlobals4) - new test
16d2eaa5