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: 4350f39 a767033)

author	Razvan Becheriu <razvan.becheriu@qualitance.com>
	Tue, 30 Jan 2018 14:42:16 +0000 (16:42 +0200)
committer	Razvan Becheriu <razvan.becheriu@qualitance.com>
	Tue, 30 Jan 2018 14:42:16 +0000 (16:42 +0200)
commit	64870d562636d10d607f4972e68fe385ffc61b56
tree	c2252ed11b51c04c9a1de743b8b810edcadf7646	tree
parent	4350f3974b0a0cbdb2e336b2da3d1e957f74e803	commit \| diff
parent	a7670339514f17d0994d0d43db193c67b6b2c282	commit \| diff

Merge branch 'master' into HEAD

15 files changed:

src/bin/dhcp4/dhcp4_messages.mes	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/get_config_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/tests/get_config_unittest.cc.skel	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/get_config_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/get_config_unittest.cc.skel	diff1 \|	diff2 \|	blob \| history
src/lib/asiolink/io_address.h	diff1 \|	diff2 \|	blob \| history
src/lib/cc/data.cc	diff1 \|	diff2 \|	blob \| history
src/lib/cryptolink/tests/run_unittests.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/cfg_option.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/pgsql_connection.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h	diff1 \|	diff2 \|	blob \| history
src/lib/process/testutils/d_test_stubs.h	diff1 \|	diff2 \|	blob \| history
src/lib/util/threads/tests/condvar_unittest.cc	diff1 \|	diff2 \|	blob \| history

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