]> git.ipfire.org Git - thirdparty/kea.git/commit
Merge branch 'isc-master' into changes
authorAndrei Pavel <andrei.pavel@qualitance.com>
Mon, 11 Jul 2016 09:50:52 +0000 (12:50 +0300)
committerAndrei Pavel <andrei.pavel@qualitance.com>
Mon, 11 Jul 2016 09:50:52 +0000 (12:50 +0300)
commit6aff99f53d991426e21f1033ac4e1fc325615271
tree7ae432408c00f849cea39c7dfba4b5d7b17ab3f9
parent28ae054ef7da1d753709eef9d7ffe0d9d568094d
parent62c941005789410d27fc0e659ca298c81b816789
Merge branch 'isc-master' into changes
14 files changed:
AUTHORS
doc/guide/dhcp6-srv.xml
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp6/dhcp6_srv.cc
src/lib/dhcp/option.cc
src/lib/dhcp/option6_ia.cc
src/lib/dhcp/option6_iaaddr.cc
src/lib/dhcp/option6_iaprefix.cc
src/lib/dhcp/option_custom.cc
src/lib/dhcp/option_int.h
src/lib/dhcp/pkt4.cc
src/lib/dhcp/pkt6.cc
src/lib/dhcp/tests/Makefile.am
src/lib/dhcp/tests/libdhcp++_unittest.cc