[master] Merge branch 'trac3234' (DHCP subnet-id increase fix)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 62a28cbc632283cb838e18dcf2baf07b360b03aa,c27d1aee764d10edcc7ec657d17286ed0456ca78..9bd379a9c0477fb14f406443da40b2e59661073b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,62 -1,8 +1,68 @@@
 -7XX.  [bug]           tomek
++730.  [bug]           tomek
+       b10-dhcp4, b10-dhcp6: Both servers used to unnecessarily increase
+       subnet-id values after reconfiguration. The subnet-ids are now reset
+       to 1 every time a server is reconfigured.
 -      (Trac #3234, git abcd)
++      (Trac #3234, git 31e416087685a6dadc3047fdbb0927bbf60095aa)
++
 +729.  [bug]           marcin
 +      b10-dhcp4 discards DHCPv4 messages carrying server identifiers
 +      which don't match server identifiers used by the server.
 +      (Trac #3279, git 805d2b269c6bf3e7be68c13f1da1709d8150a666)
 +
 +728.  [func]          marcin
 +      b10-dhcp6: If server fails to open a socket on one interface it
 +      will log a warning and continue to open sockets on other interfaces.
 +      The warning message is communicated from the libdhcp++ via the
 +      error handler function supplied by the DHCPv6 server.
 +      (Trac #3252, git af5eada1bba906697ee92df3fcc25cc0e3979221)
 +
 +727.  [func]          muks
 +      RRset::setName() has now been removed.
 +      (Trac #2335, git c918027a387da8514acf7e125fd52c8378113662)
 +
 +726.  [bug]           muks
 +      Don't print trailing newlines in Question::toText() output by
 +      default.  This fixes some logging that were split with a line
 +      feed.  It is possible to get the old behavior by passing
 +      toText(true).  Message::toText() output is unchanged.
 +      (Trac #571, git 7286499d5206c6d2aa8a59a5247c3841a772a43e)
 +
 +725.  [func]          tmark
 +      b10-dhcp-ddns D2UpdateMgr now uses the newly implemented
 +      NameAddTransaction and NameRemoveTransaction classes.  This allows
 +      it to conduct actual DNS update exchanges based upon queued
 +      NameChangeRequests.
 +      (Trac# 3089, git 9ff948a169e1c1f3ad9e1bad1568375590a3ef42)
 +
 +724.  [bug]           marcin
 +      b10-dhcp4: Different server identifiers are used for the packets
 +      being sent through different interfaces. The server uses IPv4 address
 +      assigned to the particular interface as a server identifier. This
 +      guarantees that the unicast packet sent by a relay or a client, to
 +      the address being a server identifier, will reach the server.
 +      (Trac #3231, git c7a229f15089670d2bfde6e9f0530c30ce6f8cf8)
 +
 +723.  [bug]           marcin
 +      libdhcp++: Implemented unit tests for the IfaceMgr's routine
 +      which opens IPv6 sockets on detected interfaces. The IfaceMgr
 +      logic performing low level operations on sockets has been
 +      moved to a separate class. By providing a custom implementation
 +      of this class, the unit tests may use fake interfaces with
 +      custom configuration and thus cover wide range of test
 +      scenarios for the function.
 +      (Trac #3251, git 21d2f7ec425f8461b545687104cd76a42da61b2e)
 +
 +722.  [bug]           muks
 +      b10-cmdctl now prints a more operator-friendly message when the
 +      address+port that b10-cmdctl listens on is already in use.
 +      (Trac #3227, git 5ec35e37dbb46f66ff0f6a9d9a6a87a393b37934)
 +
 +721.  [func]          tmark
 +      Updates the user_chk example hooks shared library with callouts
 +      for packet receive and packet send.  Decision outcome now includes
 +      the lease or prefix assigned.  The user registry now supports a
 +      default user entry.
 +      (Trac #3207, git 34fddf2e75b80d9e517a8f9c3321aa4878cda795)
  
  720.  [func]          tmark
        Added the initial implementation of the class, NameAddTransaction,

diff --cc doc/guide/bind10-guide.xml
Simple merge