Merge branch 'trac1367'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 267dfd271552a1ca7a111edbafc63fe669d149c3,24ca677af4df661286527314cbf710c855a0e627..c9fa5c3036d5230d0a4b1b57ce22f4964c4ca38b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,10 +1,37 @@@
 -3XX.  [doc]           tomek
++356.  [doc]           tomek
+       BIND10 Guide updated. It now describes DHCPv4 and DHCPv6
+       components, including their overview, usage, supported standard
+       and limitations. libdhcp++ is also described.
 -      (Trac #1367, git TBD)
++      (Trac #1367, git 3758ab360efe1cdf616636b76f2e0fb41f2a62a0)
+ 
 -360.  [func]          fdupont
 +355.  [bug]           jinmei
 +      Python xfrin.diff module incorrectly combined RRSIGs of different
 +      type covered, possibly merging different TTLs.  As a result a
 +      secondary server could store different RRSIGs than those at the
 +      primary server if it gets these records via IXFR.
 +      (Trac #1502, git 57b06f8cb6681f591fa63f25a053eb6f422896ef)
 +
 +354.  [func]          tomek
 +      dhcp4: Support for DISCOVER and OFFER implemented. b10-dhcp4 is
 +      now able to offer hardcoded leases to DHCPv4 clients.
 +      dhcp6: Code refactored to use the same approach as dhcp4.
 +      (Trac #1230, git aac05f566c49daad4d3de35550cfaff31c124513)
 +
 +353.  [func]          tomek
 +      libdhcp++: Interface detection in Linux implemented. libdhcp++
 +      if now able to detect available network interfaces, its link-layer
 +      addresses, flags and configured IPv4 and IPv6 addresses.
 +      (Trac #1237, git 8a040737426aece7cc92a795f2b712d7c3407513)
 +
 +352.  [func]          tomek
 +      libdhcp++: Transmission and reception of DHCPv4 packets is now
 +      implemented. Low-level hacks are not implemented for transmission
 +      to hosts that don't have IPv4 address yet, so currently the code
 +      is usable for communication with relays only, not hosts on the
 +      same link.
 +      (Trac #1239, #1240, git f382050248b5b7ed1881b086d89be2d9dd8fe385)
 +
 +351.  [func]          fdupont
        Alpha version of DHCP benchmarking tool added.  "perfdhcp" is able to
        test both IPv4 and IPv6 servers: it can time the four-packet exchange
        (DORA and SARR) as well as time the initial two-packet exchange (DO and