]> git.ipfire.org Git - thirdparty/kea.git/commit
Revert "[master] Merge branch 'trac4106'" trac3923a_base trac4234_base
authorMarcin Siodelski <marcin@isc.org>
Thu, 10 Dec 2015 21:54:57 +0000 (22:54 +0100)
committerMarcin Siodelski <marcin@isc.org>
Thu, 10 Dec 2015 22:08:59 +0000 (23:08 +0100)
commit6bc8c1cb7dec473965967f00765a4242b40b9666
treed7567e917d841e70882353597bdb0581a95f5304
parentb3ae8e478745366920a16ab2060dc91e391d4623
Revert "[master] Merge branch 'trac4106'"

This reverts commit 8f2a1f8a7a0e27a8c584186cfda089cd88ec6153, reversing
changes made to ed7edadcbd2bde368fdde86e1c997ea225b456f5.

This  merge introduced regressions in our build farm and revealed
issues in the DHCP4o6 IPC code. It also revealed some differences
in sockets handling under Linux and BSD. Rather than continue
patching this here, we should work on the branch to resolve all
issues and then merge 1.1.
27 files changed:
src/bin/dhcp4/Makefile.am
src/bin/dhcp4/ctrl_dhcp4_srv.cc
src/bin/dhcp4/dhcp4_dhcp4o6_ipc.cc [deleted file]
src/bin/dhcp4/dhcp4_dhcp4o6_ipc.h [deleted file]
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp4/tests/Makefile.am
src/bin/dhcp4/tests/dhcp4_dhcp4o6_ipc_unittest.cc [deleted file]
src/bin/dhcp6/Makefile.am
src/bin/dhcp6/ctrl_dhcp6_srv.cc
src/bin/dhcp6/dhcp6_dhcp4o6_ipc.cc [deleted file]
src/bin/dhcp6/dhcp6_dhcp4o6_ipc.h [deleted file]
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/json_config_parser.cc
src/bin/dhcp6/tests/Makefile.am
src/bin/dhcp6/tests/dhcp6_dhcp4o6_ipc_unittest.cc [deleted file]
src/lib/dhcp/tests/pkt_filter6_test_stub.cc
src/lib/dhcp/tests/pkt_filter6_test_stub.h
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/dhcp4o6_ipc.cc [deleted file]
src/lib/dhcpsrv/dhcp4o6_ipc.h [deleted file]
src/lib/dhcpsrv/srv_config.cc
src/lib/dhcpsrv/srv_config.h
src/lib/dhcpsrv/tests/Makefile.am
src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc [deleted file]
src/lib/dhcpsrv/testutils/Makefile.am
src/lib/dhcpsrv/testutils/dhcp4o6_test_ipc.cc [deleted file]
src/lib/dhcpsrv/testutils/dhcp4o6_test_ipc.h [deleted file]