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: 99b7eba 9046019)

author	Jeremy C. Reed <jreed@isc.org>
	Tue, 21 Jan 2014 21:22:49 +0000 (15:22 -0600)
committer	Jeremy C. Reed <jreed@isc.org>
	Tue, 21 Jan 2014 21:22:49 +0000 (15:22 -0600)
commit	bd923e85fd2f9bd6ad4dbfbbadae4fb43ff79210
tree	1b4b311deec7be9a1e3b185e88858681729868ea	tree \| snapshot
parent	99b7eba1c65fbf8c6c0f71fd2f930fd480fd0b03	commit \| diff
parent	904601920fec509d9d28759fa03e1f8108ee4079	commit \| diff

[2945]Merge branch 'master' into trac2945

fix merge conflicts

13 files changed:

src/bin/auth/auth_srv.cc	diff1 \|	diff2 \|	blob \| history
src/bin/auth/auth_srv.h	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/ctrl_dhcp4_srv.h	diff1 \|	diff2 \|	blob \| history
src/lib/asiolink/io_address.h	diff1 \|	diff2 \|	blob \| history
src/lib/config/config_data.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/cache_config.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/client_list.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/memory/domaintree.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/memory/rdataset.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/memory/zone_table.h	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/sqlite3_accessor.cc	diff1 \|	diff2 \|	blob \| history
src/lib/log/interprocess/interprocess_sync_file.h	diff1 \|	diff2 \|	blob \| history
src/lib/log/interprocess/interprocess_sync_null.h	diff1 \|	diff2 \|	blob \| history

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