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: c54beb5 34d2143)

author	Marcin Siodelski <marcin@isc.org>
	Wed, 23 Mar 2016 12:51:55 +0000 (13:51 +0100)
committer	Marcin Siodelski <marcin@isc.org>
	Wed, 23 Mar 2016 12:51:55 +0000 (13:51 +0100)
commit	79481043935789fc6898d4743bede1606f82eb75
tree	d570d6bd82d2bae8c14707fddfac6947d70aeb92	tree
parent	c54beb5f6e8c039052fecbfd08c84f265975436c	commit \| diff
parent	34d21432a47f584e238dd6e01ba12472447bfc52	commit \| diff

[master] Merge branch 'trac4212'

14 files changed:

AUTHORS	diff1 \|	diff2 \|	blob \| history
src/lib/dhcp/classify.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcp/classify.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcp/tests/classify_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/host.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/host.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_connection.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_connection.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_host_data_source.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_host_data_source.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/host_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc	diff1 \|	diff2 \|	blob \| history

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