From c6cd21d25a20a44d8d25834e3aa8956481cc4f41 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Tue, 5 Feb 2019 11:14:49 -0500 Subject: [PATCH] [#399,!215] Additional review comment. --- src/bin/dhcp4/tests/config_backend_unittest.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/dhcp4/tests/config_backend_unittest.cc b/src/bin/dhcp4/tests/config_backend_unittest.cc index 75d574b4bc..c9659a3e08 100644 --- a/src/bin/dhcp4/tests/config_backend_unittest.cc +++ b/src/bin/dhcp4/tests/config_backend_unittest.cc @@ -390,7 +390,6 @@ TEST_F(Dhcp4CBTest, DISABLED_mergeOptions) { // This test verifies that externally configured shared-networks are // merged correctly into staging configuration. -// @todo enable test when SrvConfig can merge shared networks. TEST_F(Dhcp4CBTest, mergeSharedNetworks) { string base_config = "{ \n" -- 2.47.2