From 0b9bfe1304a2246acb324e37e56c0eeaf26e3716 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Tue, 24 Oct 2017 13:24:57 -0400 Subject: [PATCH] [master] Added ChangeLog entry 1333 for #5275. --- ChangeLog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c09f6b7509..9428fe7536 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1333. [doc] tmark + Added a discussion of conflict resoltuion to the DHCP-DDNS chapter + of the Kea admin guide. + (Trac #5275, git ce3fe30524cdc21a9cabeafbdcb2fc3cd2e86cff) + 1332. [doc] tomek Clarified list of supported options, added examples for using hex notation to specify option values. @@ -39,8 +44,8 @@ (Trac #5393, git 0964c66d44516a04ec62c8e70be92f216fe3df5a) 1324. [doc] wlodek - Added examples of configuration for iPXE boot with DHCPv6 Kea server - (Trac #5356, git c68b9b381930d1e44fd5daa1b9d033035e32cff2) + Added examples of configuration for iPXE boot with DHCPv6 Kea server + (Trac #5356, git c68b9b381930d1e44fd5daa1b9d033035e32cff2) 1323. [doc] marcin Added new section to Kea Hooks Developer's Guide describing how -- 2.47.2