From 5a2454ec063530867dca2c46a71e342ccd98a5bb Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Mon, 23 Oct 2017 15:26:36 +0200
Subject: [PATCH] [master] Finished merge of trac5277 (bootp parameters)

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 41d0cb74dd..78099428e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1326.	[func]		fdupont
+	server-hostname and boot-file-name are now allowed in global,
+	subnet4 and shared network scopes in DHCPv4.
+	(Trac #5277, git xxx)
+
 1325.	[bug]		marcin
 	Fixed a bug whereby a reserved address could be allocated to
 	a different client when this client explicitly requested
-- 
2.47.2