summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomek Mrugalski <tomasz@isc.org>2019-02-25 12:24:41 +0100
committerTomek Mrugalski <tomasz@isc.org>2019-02-25 12:24:41 +0100
commitbb7abe493b0411ad7205e1d3254c28ffdfa59ecf (patch)
tree0cf77050c6ff2ce3cf57ed6a414c527a50731eca
parentb1a1137f252432aa956ed6fea3da21c740857333 (diff)
-rw-r--r--ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cbc7ce80df..b9487dc6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+1530. [bug] adwol
+ Potential syntax error in keactrl fixed. Thanks to Adam Osuchowski
+ from Silesian University of Technology for providing a patch.
+ (Gitlab #162,!241, git b1a1137f252432aa956ed6fea3da21c740857333)
+
1529. [func] tmark
- When fetching configuration data from configured backends,
+ When fetching configuration data from configured backends,
kea-dhcp4 will now merge global parameters.
(Gitlab #402,!224, git dadaf76f8dd61b8bb3405aa5dc80029f09b2d4ec)