git.ipfire.org Git - thirdparty/kea.git/commit

]> git.ipfire.org Git - thirdparty/kea.git/commit

projects / thirdparty / kea.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 50d9d91 9dc99c0)

author	Marcin Siodelski <marcin@isc.org>
	Tue, 6 Mar 2018 18:19:19 +0000 (19:19 +0100)
committer	Marcin Siodelski <marcin@isc.org>
	Tue, 6 Mar 2018 18:19:19 +0000 (19:19 +0100)
commit	af43f07b0e227ccabcdf07a046a64cebb11bdccf
tree	8e01dab56b3984e93ff9bb7c3f9e27a79326e07e	tree
parent	50d9d919fdf493efc4fadb0fc7cf33eb0398d8db	commit \| diff
parent	9dc99c08dc93bba2e25c55e7e93b88a5fb573744	commit \| diff

[master] Merge branch 'trac5457'

# Conflicts:
# src/bin/dhcp4/tests/callout_library_1.cc
# src/bin/dhcp4/tests/callout_library_2.cc

16 files changed:

src/bin/dhcp4/ctrl_dhcp4_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4_messages.mes	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4_srv.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4to6_ipc.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/tests/callout_library_1.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/tests/callout_library_2.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/alloc_engine.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/alloc_engine.h	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/callout_handle.cc	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/hooks_manager.cc	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/server_hooks.cc	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/tests/handles_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/tests/hooks_manager_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/hooks/tests/server_hooks_unittest.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/isc-projects/kea.git