diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-06-13 11:00:43 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-06-13 11:00:43 +0200 |
| commit | 96364cbbb15318c8f55d5b287cda0990d3eaae32 (patch) | |
| tree | f72ae77555e94cb1adcbee54207b819b36d28da1 /src/bin/dhcp6/ctrl_dhcp6_srv.h | |
| parent | [master] Missing update of configure.ac in trac3732 merge (diff) | |
| download | kea-96364cbbb15318c8f55d5b287cda0990d3eaae32.tar.xz kea-96364cbbb15318c8f55d5b287cda0990d3eaae32.zip | |
[master] Fixed merged of ctrl_dhcp6_srv.h (I misread dhcp6_srv.h, oops)
Diffstat (limited to 'src/bin/dhcp6/ctrl_dhcp6_srv.h')
| -rw-r--r-- | src/bin/dhcp6/ctrl_dhcp6_srv.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h index 763c4e97df..0c7d277a06 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.h +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h @@ -25,18 +25,8 @@ namespace dhcp { /// @brief Controlled version of the DHCPv6 server /// -<<<<<<< HEAD -/// This is a class that is responsible for DHCPv6 server being controllable. -/// It does various things, depending on the configuration backend. -/// For Bundy backend it establishes a connection with msgq and later receives -/// commands over it. For Kea backend, it reads configuration file from disk. -/// -/// For detailed explanation or relations between main(), ControlledDhcpv6Srv, -/// Dhcpv6Srv and other classes, see \ref dhcpv6Session. -======= /// This is a class that is responsible for DHCPv6 server being controllable, /// by reading configuration file from disk. ->>>>>>> trac3732 class ControlledDhcpv6Srv : public isc::dhcp::Dhcpv6Srv { public: |