summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2021-08-12 16:48:54 +0100
committerSimon Kelley <simon@thekelleys.org.uk>2021-08-12 16:48:54 +0100
commit2f2d59b35c3338ffa20361d409f07ef340987d1b (patch)
tree6d310fe41484b42054d931eda9f7ea64bfda526d /CHANGELOG
parenta1729deed3a7d456c5568c0a81450938099e66ae (diff)
downloaddnsmasq-2f2d59b35c3338ffa20361d409f07ef340987d1b.tar.gz
Define order of reading files when --addn-hosts given a directory.
Also applies to --dhcp-hostsfile and --dhcp-optsfile though it is less useful there.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d477812..717c29d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -86,6 +86,12 @@ version 2.86
conntrack is configured. Thanks to Yick Xie for spotting
the lack of this.
+ When --dhcp-hostsfile --dhcp-optsfile and --addn-hosts are
+ given a directory as argument, define the order in which
+ files within that directory are read (alphabetical order
+ of filename). Thanks to Ed Wildgoose for the initial patch
+ and motivation for this.
+
version 2.85
Fix problem with DNS retries in 2.83/2.84.