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

16 files changed, 0 insertions, 46 deletions

diff --git a/templates/show/history/brief/node.def b/templates/show/history/brief/node.def
deleted file mode 100644
index 92c76ca..0000000
--- a/templates/show/history/brief/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: recent command history
-run: HISTTIMEFORMAT='%FT%T%z '
-     HISTFILE="$HOME/.bash_history"
-     \set -o history 
-     history 20
diff --git a/templates/show/history/node.def b/templates/show/history/node.def
deleted file mode 100644
index c1487eb..0000000
--- a/templates/show/history/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: show command history
-run: HISTTIMEFORMAT='%FT%T%z '
-     HISTFILE="$HOME/.bash_history"
-     \set -o history 
-     history 
diff --git a/templates/show/history/node.tag/node.def b/templates/show/history/node.tag/node.def
deleted file mode 100644
index 2075cde..0000000
--- a/templates/show/history/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Display last N commands in history
-allowed: echo -n '<NUMBER>'
-run: HISTTIMEFORMAT='%FT%T%z '
-     HISTFILE="$HOME/.bash_history"
-     \set -o history 
-     history $3
diff --git a/templates/show/host/date/node.def b/templates/show/host/date/node.def
deleted file mode 100644
index 6ea4383..0000000
--- a/templates/show/host/date/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show host current date
-run: /bin/date
diff --git a/templates/show/host/os/node.def b/templates/show/host/os/node.def
deleted file mode 100644
index 1cfe2ec..0000000
--- a/templates/show/host/os/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show host operating system details
-run: /bin/uname -a
diff --git a/templates/show/ip/groups/node.def b/templates/show/ip/groups/node.def
deleted file mode 100644
index 18fa8bc..0000000
--- a/templates/show/ip/groups/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IP multicast group membership
-run: netstat -gn4
diff --git a/templates/show/ip/route/cache/node.def b/templates/show/ip/route/cache/node.def
deleted file mode 100644
index 098e724..0000000
--- a/templates/show/ip/route/cache/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show kernel route cache
-run: ip -s route list cache
diff --git a/templates/show/ip/route/cache/node.tag/node.def b/templates/show/ip/route/cache/node.tag/node.def
deleted file mode 100644
index 2cb78d5..0000000
--- a/templates/show/ip/route/cache/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show kernel route cache for a given route
-allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
-run: ip -s route list cache $5
diff --git a/templates/show/ip/route/forward/node.def b/templates/show/ip/route/forward/node.def
deleted file mode 100644
index 8612ba7..0000000
--- a/templates/show/ip/route/forward/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show kernel route table
-run: ip route list
diff --git a/templates/show/ip/route/forward/node.tag/node.def b/templates/show/ip/route/forward/node.tag/node.def
deleted file mode 100644
index e1ba954..0000000
--- a/templates/show/ip/route/forward/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show kernel route table for a given route
-allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
-run: ip -s route list $5
diff --git a/templates/show/ipv6/groups/node.def b/templates/show/ipv6/groups/node.def
deleted file mode 100644
index 80286e9..0000000
--- a/templates/show/ipv6/groups/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 multicast group membership
-run: netstat -gn6
diff --git a/templates/show/ipv6/neighbors/node.def b/templates/show/ipv6/neighbors/node.def
deleted file mode 100644
index 184e8c1..0000000
--- a/templates/show/ipv6/neighbors/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 Neighbor Discovery (ND) information
-run: /bin/ip -f inet6 neigh list
diff --git a/templates/show/ipv6/route/cache/node.def b/templates/show/ipv6/route/cache/node.def
deleted file mode 100644
index 45604e8..0000000
--- a/templates/show/ipv6/route/cache/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show kernel IPv6 route cache
-run: ip -s -f inet6 route list cache
diff --git a/templates/show/ipv6/route/cache/node.tag/node.def b/templates/show/ipv6/route/cache/node.tag/node.def
deleted file mode 100644
index 8386f1f..0000000
--- a/templates/show/ipv6/route/cache/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show kernel IPv6 route cache for a given route
-allowed: echo -n '<h:h:h:h:h:h:h:h | h:h:h:h:h:h:h:h/x>' 
-run: ip -s -f inet6 route list cache $5
diff --git a/templates/show/ipv6/route/forward/node.def b/templates/show/ipv6/route/forward/node.def
deleted file mode 100644
index cad0bb9..0000000
--- a/templates/show/ipv6/route/forward/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show kernel IPv6 route table
-run: ip -f inet6 route list
diff --git a/templates/show/ipv6/route/forward/node.tag/node.def b/templates/show/ipv6/route/forward/node.tag/node.def
deleted file mode 100644
index e6b92e2..0000000
--- a/templates/show/ipv6/route/forward/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show kernel IPv6 route table for a given route
-allowed: echo -n '<h:h:h:h:h:h:h:h | h:h:h:h:h:h:h:h/x>'
-run: ip -s -f inet6 route list $5