summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-04-01 13:14:26 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-04-01 13:14:26 -0500
commit13515a55b23bc7e1f37f88aee5f70bf70cf1266c (patch)
treef55fb1e1c00bec57315314bf68af35998a3cbc68
parent6c190e401bb8fd38c7e08739670986bd27defafc (diff)
parent306b773a6dc433035b88fd2193c1704c76bea66f (diff)
downloadvyatta-op-13515a55b23bc7e1f37f88aee5f70bf70cf1266c.tar.gz
vyatta-op-13515a55b23bc7e1f37f88aee5f70bf70cf1266c.zip
Merge branch 'napa' of http://git.vyatta.com/vyatta-op into napa
-rw-r--r--debian/changelog8
-rw-r--r--templates/show/ip/groups/node.def2
-rw-r--r--templates/show/ipv6/groups/node.def2
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8aa120c..1bea4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vyatta-op (0.13.104) unstable; urgency=low
+
+ * Add command to show domain name
+ * Add new command to show IP multicast groups
+ * Split Ipv4/Ipv6 multicast groups
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 31 Mar 2011 15:55:23 -0700
+
vyatta-op (0.13.103) unstable; urgency=low
[ An-Cheng Huang ]
diff --git a/templates/show/ip/groups/node.def b/templates/show/ip/groups/node.def
index b8889a1..18fa8bc 100644
--- a/templates/show/ip/groups/node.def
+++ b/templates/show/ip/groups/node.def
@@ -1,2 +1,2 @@
help: Show IP multicast group membership
-run: netstat -gn
+run: netstat -gn4
diff --git a/templates/show/ipv6/groups/node.def b/templates/show/ipv6/groups/node.def
new file mode 100644
index 0000000..80286e9
--- /dev/null
+++ b/templates/show/ipv6/groups/node.def
@@ -0,0 +1,2 @@
+help: Show IPv6 multicast group membership
+run: netstat -gn6