summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-04-18 10:41:35 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-04-18 10:41:35 -0500
commit9578473a2ba955a1b081dac28ea3aa2bbad88431 (patch)
tree75b3bc6a81ec9b38702103e2e28e8ea3e36a0a46
parent13515a55b23bc7e1f37f88aee5f70bf70cf1266c (diff)
parent17e28be540ef15c57d11b07cb8b9ad1365163078 (diff)
downloadvyatta-op-9578473a2ba955a1b081dac28ea3aa2bbad88431.tar.gz
vyatta-op-9578473a2ba955a1b081dac28ea3aa2bbad88431.zip
Merge branch 'napa' of http://git.vyatta.com/vyatta-op into napa
-rw-r--r--debian/changelog6
-rw-r--r--templates/reset/node.def1
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1bea4be..e51a70d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-op (0.13.105) unstable; urgency=low
+
+ * Adding top level "reset".
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Tue, 05 Apr 2011 10:34:21 -0700
+
vyatta-op (0.13.104) unstable; urgency=low
* Add command to show domain name
diff --git a/templates/reset/node.def b/templates/reset/node.def
new file mode 100644
index 0000000..1d8c8a9
--- /dev/null
+++ b/templates/reset/node.def
@@ -0,0 +1 @@
+help: Reset a service