summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-03-03 09:54:51 -0800
committerStephen Hemminger <shemminger@vyatta.com>2012-03-03 09:54:51 -0800
commit8a220d37283b8623b57c3f100ca7a2965d8c6ce4 (patch)
tree9184876930875695cb45afadf0d1d2d16a7a1676 /debian
parentd57a54c68677a516d4d4431d31b23361ad0c7c61 (diff)
parentb96cdd1ae44ab32072ea0613fc351050fe12ee91 (diff)
downloadvyatta-biosdevname-oxnard.tar.gz
vyatta-biosdevname-oxnard.zip
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-biosdevname into oxnardoxnard
Conflicts: debian/changelog
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 8948cbc..4342495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ vyatta-biosdevname (1:0.3.11-vyatta1) unstable; urgency=low
* Update to biosdevname 0.3.11
-- Stephen Hemminger <shemminger@vyatta.com> Fri, 02 Mar 2012 16:47:48 -0800
+
+vyatta-biosdevname (0.11+oxnard1) unstable; urgency=low
+
+ * new branch
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Sat, 03 Mar 2012 02:22:34 -0800
vyatta-biosdevname (0.11) unstable; urgency=low