diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:07:15 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:07:15 -0700 |
commit | d14face4635efff9ce7897bb7cdb23d640a5d5da (patch) | |
tree | c853a0b7552114017367c7ee5502091ef9e1e112 /debian/changelog | |
parent | 59bd1079cd35353631fc505aec6d0537e21203cf (diff) | |
parent | 8a9faf63f172a37fc12f43e504f94ce92d863a1a (diff) | |
download | vyatta-cfg-qos-d14face4635efff9ce7897bb7cdb23d640a5d5da.tar.gz vyatta-cfg-qos-d14face4635efff9ce7897bb7cdb23d640a5d5da.zip |
Merge branch 'jenner' into kenwood
Conflicts:
debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index ba80e2c..7f336b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -vyatta-cfg-qos (0.13.7) unstable; urgency=low - - * UNRELEASED - - -- An-Cheng Huang <ancheng@vyatta.com> Fri, 29 May 2009 18:35:17 -0700 - vyatta-cfg-qos (0.13.6) unstable; urgency=low * Mark probability must be > 0 |