diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-03 12:25:52 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-03 12:25:52 -0700 |
| commit | ca82ef2420d9b08ceaaa84a4e78c33aa53117ea3 (patch) | |
| tree | e31fd7bf4aa8ad6862847771044e296c5f61c1c0 | |
| parent | df44940f061294827137e5ceb03a4399d4a3fa41 (diff) | |
| parent | 314579ad52f2c388637b1e6942d3d265761a0266 (diff) | |
| download | vyatta-op-ca82ef2420d9b08ceaaa84a4e78c33aa53117ea3.tar.gz vyatta-op-ca82ef2420d9b08ceaaa84a4e78c33aa53117ea3.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-op into jenner
Conflicts:
functions/tech-support
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 305c376..830c5ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-op (0.13.18+jenner4) unstable; urgency=low + + * Ignore ntp.conf server options + * Add ethtool output to show tech-support + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 03 Jun 2009 10:24:06 -0700 + vyatta-op (0.13.18+jenner3) unstable; urgency=low * Revert "Fix completion for vif" |