From: Francis Dupont <fdupont@isc.org>
Date: Thu, 21 Sep 2017 22:01:37 +0000 (+0200)
Subject: [master] Finished merge of trac5282 (client https)
X-Git-Tag: trac5363_base~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe044fa90d53398e215d2bf31e00e83353e8774;p=thirdparty%2Fkea.git

[master] Finished merge of trac5282 (client https)
---

diff --git a/ChangeLog b/ChangeLog
index ffa95edd4d..364bb1de95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1299.	[doc]		fdupont, tmark
+	Added an example stunnel configuration file to demonstrate
+	using kea-shell through https.
+	(Trac #5282, git xxx)
+
 1298.	[func]		marcin, tomek
 	DHCPv4 server supports shared networks. It allows for grouping
 	multiple subnets and use them interchangeably to allocate