[master] Finishing merge of trac5288 (option-data in DHCPv4 pools)

diff --git a/ChangeLog b/ChangeLog
index 9d35d4614c9b09d205031ad7761f972192c6421f..3c66b46acc0dee1f975004c7a5856f563a4fa6ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1266.  [func]          fdupont
+       It is now possible to define options in DHCPv4 pools.
+       (Trac #5288, git xxx)
+
 1265.  [func]          fdupont
        Extended classification relay6[nest] syntax to allows counting
        relays from the DHCPv6 client side by using negative number,