mirror of
https://github.com/CumulusNetworks/ifupdown2.git
synced 2024-05-06 15:54:50 +00:00
Merge branch 'vmware_L2'
Conflicts: build-config/conf/extra-pkgs build-config/conf/linux.vci.config build-config/conf/snapshot-manifest-amd64 build-config/conf/version build-config/make/bcm-sdk.make build-config/make/local-pkgs.make build-config/make/local-pkgs2.make packages/cafe/scripts/build.py packages/cl-platform-config/usr/share/platform-config/accton/as6701_32x/etc/bcm.d/config.d/01config.bcm packages/cl-platform-config/usr/share/platform-config/cel/smallstone/etc/bcm.d/config.d/01config.bcm packages/cl-platform-config/usr/share/platform-config/dell/s6000_s1220/etc/bcm.d/config.d/01config.bcm packages/cl-utilities/usr/share/cumulus/support/functions packages/cl-utilities/usrlib/datapath-update packages/clag/init.d/clagd packages/clag/man/clagctl.8 packages/clag/sbin/clagctl packages/clag/sbin/clagd packages/clag/setup.py packages/ifupdown2-addons/addons/bridge.py packages/ifupdown2-addons/pkg/bridgeutils.py packages/ifupdown2-addons/pkg/ifenslaveutil.py packages/ifupdown2-addons/pkg/iproute2.py packages/ifupdown2-addons/pkg/modulebase.py packages/ifupdown2/pkg/ifupdownmain.py packages/ifupdown2/pkg/networkinterfaces.py packages/ifupdown2/pkg/scheduler.py packages/portwd/portwd packages/ptm/ptm_conf.c patches/bcm-sdk/series patches/bridge-utils/series patches/iproute/fix-bridge-batch.patch patches/iproute/fix-fdb-add.patch patches/iproute/ip-add-batch-mode-to-man-page.patch patches/iproute/series patches/iproute/show-fdb-bridge.patch patches/kernel/debian-cumulus-controlfiles.patch patches/kernel/network-bridge-fdb-learn-priority.patch patches/kernel/network-bridge-igmp-fast-leave.patch patches/kernel/network-bridge-igmpv3.patch patches/kernel/network-bridge-querier-ifaddr.patch patches/kernel/network-bridge-use-spin_lock_bh-from-process-context.patch patches/kernel/network-tun-ethtool.patch patches/kernel/network-vxlan-fix-fdb-update.patch patches/kernel/series patches/libnl/series rootconf/default/etc/cumulus/switchd.conf switchd/hal.c switchd/hal.h switchd/hal_bcm.c switchd/hal_bcm_vxlan.c switchd/hal_config.c switchd/hal_dummy.c switchd/hal_int.h switchd/hal_util.c switchd/switchd.c switchd/sync.c tests/config/__init__.py tests/config/default.cfg tests/examples/testssim2.py tests/infra/testssim2.py tests/smoke/testifupdown2.py tests/tests/examples/testssim2.py utilities/distro-cmd utilities/packages/ssim2/simlib.py utilities/packages/testfu/scripts/runteststmpl.sh utilities/packages/testfu/scripts/xmltoresults.py
This commit is contained in:
Cumulus Builds