summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-03-10 11:06:57 -0800
committerStephen Hemminger <shemminger@vyatta.com>2012-03-10 11:06:57 -0800
commit9758ab5e62e40e9df80eb1489b49bd177f77f8a7 (patch)
tree6505bfaf8201e78f0ff8d348c106ad9aca5d283e
parent91464a4f853e3c2ad0017a13ffc1e6e3be633e04 (diff)
parent3e416f32b662df44fe7d03788ca8c6527ac6147c (diff)
downloadvyatta-op-9758ab5e62e40e9df80eb1489b49bd177f77f8a7.tar.gz
vyatta-op-9758ab5e62e40e9df80eb1489b49bd177f77f8a7.zip
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-op into oxnard
-rw-r--r--.frlog1
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 0 deletions
diff --git a/.frlog b/.frlog
index aed333b..03f1996 100644
--- a/.frlog
+++ b/.frlog
@@ -3,3 +3,4 @@ Mon Apr 25 11:20:27 CDT 2011: [I had the wrong URL for this repo and the previou
Thu Jul 7 20:58:04 PDT 2011: [new branch] at [debian/0.13.152]
Mon Jul 11 12:51:04 CDT 2011: [re-release of package due to bad git config] at [debian/0.13.154]
Tue Nov 15 23:51:06 NOVT 2011: [Force release] at [debian/0.13.215]
+Sat Mar 3 02:23:39 PST 2012: [new branch] at [debian/0.13.245]
diff --git a/debian/changelog b/debian/changelog
index 7f2505c..0bdf6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.245+oxnard1) unstable; urgency=low
+
+ * new branch
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Sat, 03 Mar 2012 02:23:40 -0800
+
vyatta-op (0.13.245) unstable; urgency=low
* Fix tech-support save command