summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-04-09 12:13:40 -0700
committerrbalocca <rbalocca@vyatta.com>2008-04-09 12:13:40 -0700
commit83a366af37994c074a8cb2b296db34085b3c8cb0 (patch)
tree8aa9efbce935266f7c6f42a973851e35e7d69c7b
parent5351776c92aba1febae07f6558976be8a4002248 (diff)
parent00cbb4749430199b3f864194bc1e908ddd2dc153 (diff)
downloadvyatta-cfg-firewall-83a366af37994c074a8cb2b296db34085b3c8cb0.tar.gz
vyatta-cfg-firewall-83a366af37994c074a8cb2b296db34085b3c8cb0.zip
Merge branch 'glendale' into hollywood
Conflicts: scripts/firewall/vyatta-firewall.pl
-rw-r--r--debian/changelog15
1 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a4add3f..32c601d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+vyatta-cfg-firewall (0.4) unstable; urgency=low
+
+ 3.0.2
+ [ Mark O'Brien ]
+
+ * 3.0.1
+
+ [ rbalocca ]
+ * Fix debian dependencies
+ * Set dependencies on either bash or vyatta-bash
+
+ [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com> Fri, 04 Apr 2008 18:00:16 -0700
+
vyatta-cfg-firewall (0.3) unstable; urgency=low
VC4.0.1