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: 079b324 91c55ca)

author	Marcin Siodelski <marcin@isc.org>
	Tue, 27 Oct 2015 10:19:35 +0000 (11:19 +0100)
committer	Marcin Siodelski <marcin@isc.org>
	Tue, 27 Oct 2015 10:19:35 +0000 (11:19 +0100)
commit	5880e706cb27c19b1b70296ccd8d96e38e82027b
tree	d4bf65869aa71f90a9d9041c1c34e214c41bfa2b	tree
parent	079b324945e4fae502572260926ba415c6e7c854	commit \| diff
parent	91c55ca0902e2f9b908ef86beaca618e0dffb9cc	commit \| diff

[master] Merge branch 'trac3977'

13 files changed:

src/bin/dhcp4/dhcp4_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4_srv.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/tests/dhcp4_test_utils.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/dhcp6_messages.mes	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/dhcp6_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/dhcp6_srv.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/dhcp6_test_utils.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/fqdn_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcp/tests/pkt6_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/alloc_engine.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/alloc_engine_messages.mes	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/dhcpsrv_messages.mes	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc	diff1 \|	diff2 \|	blob \| history

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