git.ipfire.org Git - thirdparty/kea.git/commit

]> git.ipfire.org Git - thirdparty/kea.git/commit

projects / thirdparty / kea.git / commit

author	Tomek Mrugalski <tomasz@isc.org>
	Fri, 8 Aug 2014 16:42:01 +0000 (18:42 +0200)
committer	Tomek Mrugalski <tomasz@isc.org>
	Fri, 8 Aug 2014 16:42:01 +0000 (18:42 +0200)
commit	64350f6950e38e19db415ec967363468534142dd
tree	f0d4b1f54c0690dc0bc9e98d29b076bc6750a4db	tree
parent	884f305153b26ee96c568f8bfc2064e5c929d3c0	commit \| diff
parent	23285903645c36fc35c6866a74c50c74089cd255	commit \| diff

[master] Merge branch 'trac3427' (logging configuration in kea4,kea6,d2)

Conflicts:
ChangeLog
configure.ac
src/bin/dhcp4/kea_controller.cc
src/bin/dhcp6/kea_controller.cc
src/bin/dhcp6/main.cc
src/lib/log/logger_manager.cc
src/lib/log/logger_unittest_support.cc
src/lib/log/logger_unittest_support.h

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

RSS Atom

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/bin/d2/d_controller.cc	diff1 \|	diff2 \|	blob \| history
src/bin/d2/tests/d2_process_tests.sh.in	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/kea_controller.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp4/main.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/kea_controller.cc	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/main.cc	diff1 \|	diff2 \|	blob \| history
src/bin/keactrl/tests/keactrl_tests.sh.in	diff1 \|	diff2 \|	blob \| history
src/lib/log/logger_manager.cc	diff1 \|	diff2 \|	blob \| history
src/lib/log/logger_unittest_support.cc	diff1 \|	diff2 \|	blob \| history