]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge remote-tracking branch 'isc-kea/master' into HEAD 38/head
authorRazvan Becheriu <razvan.becheriu@qualitance.com>
Tue, 12 Dec 2017 12:28:29 +0000 (14:28 +0200)
committerRazvan Becheriu <razvan.becheriu@qualitance.com>
Tue, 12 Dec 2017 12:28:29 +0000 (14:28 +0200)
21 files changed:
1  2 
src/lib/config/Makefile.am
src/lib/config/tests/command_mgr_unittests.cc
src/lib/dhcpsrv/cfg_option.cc
src/lib/dhcpsrv/client_class_def.cc
src/lib/dhcpsrv/host_data_source_factory.cc
src/lib/dhcpsrv/mysql_connection.cc
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
src/lib/dns/tests/masterload_unittest.cc
src/lib/dns/tests/messagerenderer_unittest.cc
src/lib/dns/tests/rrclass_unittest.cc
src/lib/eval/eval_context.cc
src/lib/eval/lexer.cc
src/lib/eval/parser.cc
src/lib/eval/token.cc
src/lib/hooks/tests/callout_manager_unittest.cc
src/lib/hooks/tests/hooks_manager_unittest.cc
src/lib/log/Makefile.am
src/lib/process/io_service_signal.cc
src/lib/testutils/io_utils.cc
src/lib/testutils/unix_control_client.cc
tools/system_messages.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge