summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c8e812..7a22d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+vlan (1.9-3.2ubuntu1) utopic; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - Add a udeb for vconfig in debian-installer.
+ - Add support for biosdevname
+ - Revert ifupdown integration as event based bringup is currently
+ incompatible with the way ifupdown sets up bridges and vlans.
+ - Add udev hook and script for event based bring up.
+
+ -- Stéphane Graber <stgraber@ubuntu.com> Fri, 02 May 2014 18:21:06 -0400
+
+vlan (1.9-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't exit when we're called by bridge-utils.
+
+ -- Andrew Shadura <andrewsh@debian.org> Tue, 01 Apr 2014 09:42:56 +0200
+
+vlan (1.9-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't act on VLAN interfaces already supported by ifupdown
+ (Closes: #705456)
+ * Don't depend on iproute, depend on iproute2 instead.
+
+ -- Andrew Shadura <andrewsh@debian.org> Sun, 23 Mar 2014 14:42:43 +0100
+
vlan (1.9-3ubuntu10) trusty; urgency=medium
* Only create VLANs for the interface we are processing. (LP: #1295371)