Merge branch 'current' of github.com:vyos/vyatta-op into equuleus

* 'current' of github.com:vyos/vyatta-op:
  [ping] T1450 Recovering ping for ipv6
  T1621 remove misc ops after python/xml rewrite
  T1607 remove 'reset conntrack', 'reset & show ip[v6]' ops after xml rewrite
  T1596 Remove telnet and traceroute operations after xml-style rewrite

13 files changed, 0 insertions, 37 deletions

diff --git a/templates/set/console/keymap/node.def b/templates/set/console/keymap/node.def
deleted file mode 100644
index 5ab2f24..0000000
--- a/templates/set/console/keymap/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Reconfigure console keyboard layout
-run: sudo dpkg-reconfigure -f dialog keyboard-configuration
-     sudo /etc/init.d/keyboard-setup restart
diff --git a/templates/set/console/node.def b/templates/set/console/node.def
deleted file mode 100644
index 29bae4d..0000000
--- a/templates/set/console/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Control console behaviors
diff --git a/templates/set/node.tag/node.def b/templates/set/node.tag/node.def
deleted file mode 100644
index 908d521..0000000
--- a/templates/set/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Bash builtin set command
-allowed: echo -n '<OPTION>'
-run: builtin $*
diff --git a/templates/set/terminal/key/node.def b/templates/set/terminal/key/node.def
deleted file mode 100644
index be435af..0000000
--- a/templates/set/terminal/key/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set key behaviors
diff --git a/templates/set/terminal/key/query-help/node.def b/templates/set/terminal/key/query-help/node.def
deleted file mode 100644
index c15f556..0000000
--- a/templates/set/terminal/key/query-help/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Enable/disable getting help using question mark
diff --git a/templates/set/terminal/key/query-help/node.tag/node.def b/templates/set/terminal/key/query-help/node.tag/node.def
deleted file mode 100644
index 8ea9fbf..0000000
--- a/templates/set/terminal/key/query-help/node.tag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Enable/disable getting help using question mark (default enabled)
-allowed: echo -n 'enable' 'disable'
-run: if [ "$5" == 'disable' ]; then
-       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
-       echo "bind '\"?\": self-insert' # vyatta key binding" >> $HOME/.bashrc
-       bind '"?": self-insert'
-     else
-       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
-       bind '"?": possible-completions'
-     fi
diff --git a/templates/set/terminal/length/node.def b/templates/set/terminal/length/node.def
deleted file mode 100644
index 3e24898..0000000
--- a/templates/set/terminal/length/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set terminal rows
diff --git a/templates/set/terminal/length/node.tag/node.def b/templates/set/terminal/length/node.tag/node.def
deleted file mode 100644
index 42a0726..0000000
--- a/templates/set/terminal/length/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Set terminal to given number of rows (0 disables paging)
-allowed: echo -n '<NUMBER>'
-run: if [ "$4" -eq 0 ] ; then
-	VYATTA_PAGER=cat
-     else
-	stty rows $4
-     fi
diff --git a/templates/set/terminal/node.def b/templates/set/terminal/node.def
deleted file mode 100644
index cdc1793..0000000
--- a/templates/set/terminal/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Control terminal behaviors
diff --git a/templates/set/terminal/pager/node.def b/templates/set/terminal/pager/node.def
deleted file mode 100644
index d2d414d..0000000
--- a/templates/set/terminal/pager/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to use default pager (less)
-run:  VYATTA_PAGER=$_vyatta_default_pager
diff --git a/templates/set/terminal/pager/node.tag/node.def b/templates/set/terminal/pager/node.tag/node.def
deleted file mode 100644
index dd5a3de..0000000
--- a/templates/set/terminal/pager/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set terminal pager
-allowed: echo -n '<PROGRAM>'
-run: VYATTA_PAGER=$4
diff --git a/templates/set/terminal/width/node.def b/templates/set/terminal/width/node.def
deleted file mode 100644
index ddbc07d..0000000
--- a/templates/set/terminal/width/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set terminal columns
diff --git a/templates/set/terminal/width/node.tag/node.def b/templates/set/terminal/width/node.tag/node.def
deleted file mode 100644
index 792f34a..0000000
--- a/templates/set/terminal/width/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set terminal to given number of columns
-allowed: echo -n '<NUMBER>'
-run: stty columns $4