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: 72b477c a104287)

author	Tomek Mrugalski <tomasz@isc.org>
	Mon, 16 Feb 2015 19:26:38 +0000 (20:26 +0100)
committer	Tomek Mrugalski <tomasz@isc.org>
	Mon, 16 Feb 2015 19:26:38 +0000 (20:26 +0100)
commit	cfbe13ad05aac23e09357fc78507cf9a82c908e6
tree	8f63a71d35c67682760105c600e9f48f2bfb42fd	tree \| snapshot
parent	72b477cbc7ddbba6be006190b7b420f6e3f5c175	commit \| diff
parent	a104287eb44b743519e02d7c3d6a20e38412a039	commit \| diff

[master] Merge branch 'trac3565' (host reservations mac+dhcpv6)

Conflicts:
src/bin/dhcp6/dhcp6_srv.cc

15 files changed:

doc/guide/dhcp4-srv.xml	diff1 \|	diff2 \|	blob \| history
doc/guide/dhcp6-srv.xml	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/dhcp4.spec	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/json_config_parser.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/tests/config_parser_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/dhcp6.spec	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/dhcp6_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/json_config_parser.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/config_parser_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/alloc_engine.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/parsers/dhcp_parsers.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/parsers/dhcp_parsers.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/alloc_engine_utils.h	diff1 \|	diff2 \|	blob \| history

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