summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog17
1 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index f6c6354..d219a96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+conntrack (1:1.0.1-2+vyatta20+oxnard2) unstable; urgency=low
+
+ * Merge pacifica to oxnard to support user space helpers. Backportin.
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Sun, 10 May 2012 02:21:37 -0800
+
+conntrack (1:1.0.1-2+vyatta20+oxnard1) unstable; urgency=low
+
+ * new branch
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Sat, 03 Mar 2012 02:21:37 -0800
conntrack (1:1.0.1-2+vyatta32) unstable; urgency=low
[ Pablo Neira Ayuso ]
@@ -129,12 +140,6 @@ conntrack (1:1.0.1-2+vyatta22) unstable; urgency=low
-- Gaurav <gaurav.sinha@vyatta.com> Mon, 09 Apr 2012 17:05:19 -0700
-conntrack (1:1.0.1-2+vyatta21) unstable; urgency=low
-
- * new branch
-
- -- Deepti Kulkarni <deepti@vyatta.com> Sat, 03 Mar 2012 02:24:17 -0800
-
conntrack (1:1.0.1-2+vyatta20) unstable; urgency=low
[ Pablo Neira Ayuso ]