From 53dae1e02959fc1a90632b73e2b1220c45bcd508 Mon Sep 17 00:00:00 2001
From: Gaurav Sinha <gaurav.sinha@vyatta.com>
Date: Fri, 6 Jul 2012 16:26:50 -0700
Subject: 1:1.0.1-2+vyatta20+oxnard6

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3542f50..8a4a620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+conntrack (1:1.0.1-2+vyatta20+oxnard6) unstable; urgency=low
+
+  [ Pablo Neira Ayuso ]
+  * conntrackd: add bugtrap notice in case of flush while commit in
+    progress
+  * conntrackd: fix commit operation, needs to be synchronous
+
+  [ Gaurav Sinha ]
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com>  Fri, 06 Jul 2012 16:26:50 -0700
+
 conntrack (1:1.0.1-2+vyatta20+oxnard5) unstable; urgency=low
 
   * force release
-- 
cgit v1.2.3