]> git.proxmox.com Git - mirror_iproute2.git/commit
projects / mirror_iproute2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bea42e6 e06e9a6)
Merge branch 'mcast-json' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Mon, 12 Mar 2018 01:53:36 +0000 (18:53 -0700)
committerDavid Ahern <dsahern@gmail.com>
Mon, 12 Mar 2018 01:53:36 +0000 (18:53 -0700)
commita121129df91104ade8f51ac9ccd6e3a84bbddf27
tree755588fe9fa57d731dfd20c227e0c0c4c429dacdtree
parentbea42e6c24d9d6eece13dcf0af388e305e2342dacommit | diff
parente06e9a6bac6a8e16ee6580635f891bd2dfd1a1b6commit | diff
Merge branch 'mcast-json' into iproute2-next

Stephen Hemminger  says:

====================

From: Stephen Hemminger <sthemmin@microsoft.com>

Some more JSON support and report better error if kernel
is configured without multicast.

====================

Signed-off-by: David Ahern <dsahern@gmail.com>
Upstream mirror of iproute2