diff options
| author | Tomek Mrugalski <tomasz@isc.org> | 2015-06-10 13:36:06 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomasz@isc.org> | 2015-06-10 13:36:06 +0200 |
| commit | d3da062d51d7d5201a9ff2ef2e559bcb7beed561 (patch) | |
| tree | 5d292a40a0cc1832fb38d4e6bdf048e2e2980c40 /src/bin/dhcp6/tests/dhcp6_test_utils.cc | |
| parent | [master] Added ChangeLog entry 944. (diff) | |
| parent | [3796] Minor edit in one comment. (diff) | |
| download | kea-d3da062d51d7d5201a9ff2ef2e559bcb7beed561.tar.xz kea-d3da062d51d7d5201a9ff2ef2e559bcb7beed561.zip | |
[master] Merge branch 'trac3796' (statistics interface, part 1)
Conflicts:
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/bin/dhcp6/tests/dhcp6_test_utils.cc
Diffstat (limited to 'src/bin/dhcp6/tests/dhcp6_test_utils.cc')
| -rw-r--r-- | src/bin/dhcp6/tests/dhcp6_test_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc index 2e93c1053d..8816aa53d0 100644 --- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc +++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc @@ -16,8 +16,8 @@ #include <gtest/gtest.h> #include <dhcp6/tests/dhcp6_test_utils.h> #include <dhcp6/json_config_parser.h> -#include <config/ccsession.h> #include <util/pointer_util.h> +#include <cc/command_interpreter.h> #include <string.h> using namespace isc::data; |