summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-06-24 12:34:31 +0200
committerDaniil Baturin <daniil@baturin.org>2018-06-24 12:34:31 +0200
commitfbc72527765b236a65740cd5d9f7f2c3f7e9a87e (patch)
tree13c5bd2858ff8fb561f3057c970821c7d503cc99 /debian/changelog
parent7d1875d601e0c975f1ab7ae57f7595b49e401390 (diff)
parent96a8f5e74295e3a06bb8c2ca92e1b35597db9377 (diff)
downloadvyatta-cfg-firewall-lithium.tar.gz
vyatta-cfg-firewall-lithium.zip
Merge branch 'current' into lithiumlithium
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog16
1 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index c51a0ce..c0b54d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-vyatta-cfg-firewall (0.14.0+vyos2+lithium17) unstable; urgency=low
+vyatta-cfg-firewall (0.14.0+vyos2+lithium17) UNRELEASED; urgency=medium
- * Remove dead code from the IPset module.
+ * Sync with current.
- -- Daniil Baturin <daniil@baturin.org> Tue, 22 Dec 2015 21:38:37 +0100
+ -- Daniil Baturin <daniil@baturin.org> Sun, 24 Jun 2018 12:31:12 +0200
+
+vyatta-cfg-firewall (0.14.0+vyos2+current1) unstable; urgency=medium
+
+ [ Thomas Jepp ]
+ * Fix build depends.
+ * Fix runtime depends.
+
+ [ Kim Hagen ]
+
+ -- Kim Hagen <kim.sidney@gmail.com> Sun, 24 Jan 2016 15:00:40 -0500
vyatta-cfg-firewall (0.14.0+vyos2+lithium16) unstable; urgency=low