From: David Ahern Date: Fri, 15 Mar 2019 21:01:35 +0000 (-0700) Subject: Merge branch 'bond-bridge-xstats-json' into next X-Git-Tag: v5.1.0~27^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7081aa6556ae81cabcbf9b2b0d2f146313055a56;p=thirdparty%2Fiproute2.git Merge branch 'bond-bridge-xstats-json' into next Nikolay Aleksandrov says: ==================== This set adds json output support to the xstats API (patch 01) and then adds json support to the bridge xstats output (patch 02) and adds xstats output support (both plain text and json) for the bonding (patch 03). It doesn't change the bridge's plain text output, but it fixes an inconsistency that could happen if new bridge xstats attributes were added (print the interface name once for each group of xstats attrs). ==================== Signed-off-by: David Ahern --- 7081aa6556ae81cabcbf9b2b0d2f146313055a56