summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-11-21 02:34:28 -0800
committerBob Gilligan <gilligan@vyatta.com>2010-11-21 02:34:28 -0800
commit39c850fc508e078bfd680140e1ce1797881ef905 (patch)
tree5ed22bdefa569f2481139fc370df03a94a56151c
parentb44facda004ce5ea6d4485778522fb2d11080ab0 (diff)
parentf152f6c304caafbecaaf6719ecd1fa26bd613d5e (diff)
downloadvyatta-op-39c850fc508e078bfd680140e1ce1797881ef905.tar.gz
vyatta-op-39c850fc508e078bfd680140e1ce1797881ef905.zip
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-op into mendocino
-rw-r--r--debian/changelog10
-rw-r--r--templates/show/configuration/commands/node.def (renamed from templates/show/configuration/cmds/node.def)0
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c0260be..32cd058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vyatta-op (0.13.93) unstable; urgency=low
+
+ [ Stephen Hemminger ]
+ * Use lesspipe to display gzip files
+
+ [ Stig Thormodsrud ]
+ * Fix 6353: ENH: Rename "show configuration cmds"
+
+ -- Stig Thormodsrud <stig@vyatta.com> Mon, 22 Nov 2010 11:35:05 -0800
+
vyatta-op (0.13.92) unstable; urgency=low
[ Stephen Hemminger ]
diff --git a/templates/show/configuration/cmds/node.def b/templates/show/configuration/commands/node.def
index a2d55cf..a2d55cf 100644
--- a/templates/show/configuration/cmds/node.def
+++ b/templates/show/configuration/commands/node.def