summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGaurav Sinha <gaurav.sinha@vyatta.com>2012-01-20 15:47:39 -0800
committerGaurav Sinha <gaurav.sinha@vyatta.com>2012-01-20 15:47:39 -0800
commit6a0139b85ca31ea88520c8896e97eb5228cc25df (patch)
treeb43b0a1b92ee37369262e3a6dd19e0f94464151b /debian
parente72ca98329a25414108e2af350c4014de9e8f736 (diff)
downloadconntrack-tools-6a0139b85ca31ea88520c8896e97eb5228cc25df.tar.gz
conntrack-tools-6a0139b85ca31ea88520c8896e97eb5228cc25df.zip
updating changelog for merge of expect-sync and oxnard
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6b1f481..05ad082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+conntrack (0.9.14-2+vyatta14) unstable; urgency=low
+
+ * Collapse of expect-sync branch to oxnard. Brings in support for expect table sync.
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Thu, 07 Jul 2011 20:52:06 -0700
+
conntrack (0.9.14-2+vyatta13) unstable; urgency=low
* new branch