]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5305'
authorMarcin Siodelski <marcin@isc.org>
Thu, 7 Sep 2017 16:08:35 +0000 (18:08 +0200)
committerMarcin Siodelski <marcin@isc.org>
Thu, 7 Sep 2017 16:08:35 +0000 (18:08 +0200)
commit76dd46f7070c141cc89d772d69a897b67bd179a1
tree8e3da806d6ba4946cf79c2621fe127fd0779f47e
parent840824fe76519704f926e9b452a8a32d32a63918
parent38719d4fd9e8e7cd8b51cbaf6a86885c7f050e0a
[master] Merge branch 'trac5305'

# Conflicts:
# src/lib/dhcpsrv/parsers/dhcp_parsers.cc
# src/lib/dhcpsrv/subnet.cc
# src/lib/dhcpsrv/subnet.h
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp4/tests/dhcp4_test_utils.h
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/subnet.cc
src/lib/dhcpsrv/subnet.h