diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-03 09:54:51 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-03 09:54:51 -0800 |
| commit | 8a220d37283b8623b57c3f100ca7a2965d8c6ce4 (patch) | |
| tree | 9184876930875695cb45afadf0d1d2d16a7a1676 | |
| parent | d57a54c68677a516d4d4431d31b23361ad0c7c61 (diff) | |
| parent | b96cdd1ae44ab32072ea0613fc351050fe12ee91 (diff) | |
| download | vyatta-biosdevname-oxnard.tar.gz vyatta-biosdevname-oxnard.zip | |
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-biosdevname into oxnardoxnard
Conflicts:
debian/changelog
| -rw-r--r-- | .frlog | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -1,2 +1,3 @@ Tue Dec 28 20:45:12 UTC 2010: [new branch] at [debian/0.8] Thu Jul 7 20:54:45 PDT 2011: [new branch] at [debian/0.10] +Sat Mar 3 02:22:33 PST 2012: [new branch] at [debian/0.11] 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 |