[master] Finished merge of trac5277 (bootp parameters)

diff --git a/ChangeLog b/ChangeLog
index 41d0cb74dd51ad3436b19c9ccc5fb79ddf559f58..78099428e465706d0c19e1efd32347f3ae1d1a46 100644 (file)
--- 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