From: Shawn Routhier <sar@isc.org>
Date: Mon, 6 Jun 2016 20:13:37 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.kea.isc.org/git/kea
X-Git-Tag: trac4106_update_base~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28c4b2575b4f7808f2470774b4bcdc42f4d80abc;p=thirdparty%2Fkea.git

Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
	ChangeLog
---

28c4b2575b4f7808f2470774b4bcdc42f4d80abc
diff --cc ChangeLog
index 04bc368b3e,e5157ddbb5..389fa5ac03
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
- 1120.	[bug]		sar
++1121.	[bug]		sar
 +	Update the classification document to match the output from
 +	the debug statements.
 +	(Trac NA, git TBD)
 +
+ 1120.	[func]		marcin
+ 	Extended MySQL host data source to retrieve DHCPv4 and DHCPv6
+ 	options associated with hosts from a MySQL database.
+ 	(Trac #4281, git b8a306a27d1cae03f6bc5223c30806f5cd1b64f4)
+ 
  1119.	[func]		sar
  	Add debug logging to the classification tokens.  This uses
  	the loggers "kea-dhcp4.eval" and "kea-dhcp6.eval" to capture