summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-04-15 18:24:05 +0200
committerChristian Poessinger <christian@poessinger.com>2018-04-15 18:24:05 +0200
commitaf31124beacb0c9f4c5798236376b0298a79f1fc (patch)
treee75721244dbccfd30aa2345f1940529c2e66a29c /debian
parentbdda9e84e55d80fafc7cd115d7beb858d4a1a00d (diff)
parent7ca3c19b574d31adcd5f6c962e4177f43fb17f7b (diff)
downloadvyos-1x-af31124beacb0c9f4c5798236376b0298a79f1fc.tar.gz
vyos-1x-af31124beacb0c9f4c5798236376b0298a79f1fc.zip
Merge branch 'powerdns-recursor' into current
* powerdns-recursor: Update debian/changelog - 1.0.4 Makefile: Fix for special nodes not requiring have any 'type' field dns-forwarding: XML: fix indention dns-forwarding: add completion helper for dhcp T560: dns-forwarding: replace dnsmasq with pdns-recursor dns-forwarding: XML: Bugfix DNS domain forward configuration nodes dns-forwarding.py: add missing 'query-all-servers' path Initial working version for XML interface to configure dnsmasq Initial CLI interface support for XML DNS forwarder
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3db7c422e..71faeb912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyos-1x (1.0.4) UNRELEASED; urgency=medium
+
+ * T560: dns-forwarding: replace dnsmasq with pdns-recursor
+ * T588: Rewrite 'service dns forwarding' in new XML style format
+
+ -- Christian Poessinger <christian@poessinger.com> Sun, 15 Apr 2018 16:13:32 +0200
+
vyos-1x (1.0.3) unstable; urgency=medium
* T379: Add UDP broadcast relay support