]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c63a29 6cf8d90)
[github24] Merge remote-tracking branch 'andreipavelQ/master' into github24
authorMarcin Siodelski <marcin@isc.org>
Tue, 26 Jul 2016 06:12:23 +0000 (08:12 +0200)
committerMarcin Siodelski <marcin@isc.org>
Tue, 26 Jul 2016 16:45:19 +0000 (18:45 +0200)
This part of the merge contains replacing "dhcp4" with DHCP4_OPTION_SPACE
and "dhcp6" with DHCP6_OPTION_SPACE.

1  2 
src/bin/dhcp4/dhcp4_srv.cc patch | diff1 | diff2 | blob | history

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge
Mirror of https://github.com/isc-projects/kea.git