diff options
author | Stephen Morris <stephen@isc.org> | 2012-12-13 12:38:21 +0100 |
---|---|---|
committer | Stephen Morris <stephen@isc.org> | 2012-12-13 12:38:21 +0100 |
commit | fecfe82bdfc93fedc24263a8f1bbdcedf59a7b71 (patch) | |
tree | 7732cab829d32201874815d7afdeb0ddf22db874 /src/lib/dhcpsrv/database_backends.dox | |
parent | [2546] Address further issues pointed out in review (diff) | |
parent | Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10 (diff) | |
download | kea-fecfe82bdfc93fedc24263a8f1bbdcedf59a7b71.tar.xz kea-fecfe82bdfc93fedc24263a8f1bbdcedf59a7b71.zip |
[2546] Merge branch 'master' into trac2546
Conflicts:
doc/devel/mainpage.dox
src/bin/dhcp4/ctrl_dhcp4_srv.h
src/bin/dhcp4/dhcp4_srv.h
src/bin/dhcp6/dhcp6.dox
Also modified the following files during the
resolution of the merge issues:
src/bin/dhcp4/config_parser.cc
src/bin/dhcp4/ctrl_dhcp4_srv.cc
src/bin/dhcp4/dhcp4.dox
src/bin/dhcp6/config_parser.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/lib/dhcp/option_custom.h
src/lib/dhcp/pkt4.h
src/lib/dhcpsrv/database_backends.dox
Diffstat (limited to 'src/lib/dhcpsrv/database_backends.dox')
-rw-r--r-- | src/lib/dhcpsrv/database_backends.dox | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/dhcpsrv/database_backends.dox b/src/lib/dhcpsrv/database_backends.dox index f954bed1b1..a3b3b0c210 100644 --- a/src/lib/dhcpsrv/database_backends.dox +++ b/src/lib/dhcpsrv/database_backends.dox @@ -1,5 +1,5 @@ /** - @page dhcp-database-backends DHCP Database Back-Ends + @page dhcpDatabaseBackends DHCP Database Back-Ends All DHCP lease data is stored in some form of database, the interface to this being through the Lease Manager. |