summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Sinha <gaurav.sinha@vyatta.com>2012-02-08 11:46:41 -0800
committerGaurav Sinha <gaurav.sinha@vyatta.com>2012-02-08 11:46:41 -0800
commit86eebac3fe1e146e29b17aca2071a280b68aefcf (patch)
treec835b109f6b42559d7c3e60bbb6d167528cf517a
parent21e68c7e4653ff077d0f0182b5d1da2f8645b6c6 (diff)
parent63ea1bd67230a5b8c2dceeab154e100b9deff907 (diff)
downloadconntrack-tools-86eebac3fe1e146e29b17aca2071a280b68aefcf.tar.gz
conntrack-tools-86eebac3fe1e146e29b17aca2071a280b68aefcf.zip
Merge branch 'oxnard' of git.vyatta.com:/git/conntrack-tools into oxnard
-rw-r--r--.frlog1
-rw-r--r--debian/changelog13
2 files changed, 14 insertions, 0 deletions
diff --git a/.frlog b/.frlog
index 6958de7..f634c87 100644
--- a/.frlog
+++ b/.frlog
@@ -1,2 +1,3 @@
Tue Dec 28 20:41:49 UTC 2010: [new branch] at [debian/0.9.14-2+vyatta11]
Thu Jul 7 20:52:06 PDT 2011: [new branch] at [debian/0.9.14-2+vyatta12]
+Tue Jan 31 11:15:48 PST 2012: [reset epoch] at [debian/1.0.1-2+vyatta18]
diff --git a/debian/changelog b/debian/changelog
index ad98ab8..55200dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+conntrack (1:1.0.1-2+vyatta19) unstable; urgency=low
+
+ * reset epoch
+ * 1:1.0.1-2+vyatta18
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Fri, 03 Feb 2012 09:01:41 -0800
+
+conntrack (1:1.0.1-2+vyatta18) unstable; urgency=low
+
+ * add epoch to version number to match Debian numbering
+
+ -- Stephen Hemminger <shemminger@vyatta.com> Tue, 31 Jan 2012 11:15:50 -0800
+
conntrack (1.0.1-2+vyatta18) unstable; urgency=low
[ Pablo Neira Ayuso ]