mirror of
https://github.com/CumulusNetworks/ifupdown2.git
synced 2024-05-06 15:54:50 +00:00
97f4cff80c
Conflicts: build-config/make/local-pkgs.make packages/cafe/clobjects.py packages/cafe/clobjects_l3_quagga.py packages/cl-basefiles/etc/cumulus/datapath/traffic.conf packages/cl-utilities/etc/monit/monitrc.d/cumulus packages/clag/ifupdown/clagd.py packages/ifupdown2/addons/bridge.py packages/ifupdown2/addons/ifenslave.py packages/ifupdown2/ifupdown/iface.py packages/ifupdown2/ifupdown/ifupdownmain.py packages/ifupdown2/ifupdown/scheduler.py packages/portwd/portwd patches/bcm-sdk/series patches/iproute/bridge-increase-netlink-rcv-buf-size.patch patches/iproute/series patches/kernel/driver-support-sff-8436-eeprom.patch patches/kernel/network-bridge-dont-install-local-mac.patch patches/kernel/series patches/lldpd/series patches/mstpd/clag_port_fsm_reset.patch patches/mstpd/mstpd_init_system.patch patches/mstpd/series patches/quagga/series rootconf/default/etc/default/cron switchd/hal.c switchd/hal_bcm.c switchd/hal_bcm_config.c switchd/hal_bcm_config.h switchd/hal_config.c switchd/hal_config.h switchd/hal_int.h switchd/sync.c tests/tests/l3/bgp_alpm_test.py tests/tests/l3/bgp_path_hunting.py tests/tests/l3/bgp_smoke_test.py tests/tests/l3/l3_node.py tests/tests/l3/mc_snoop_test.py tests/tests/lib/decorators.py tests/tests/smoke/testifupdown2.py utilities/ci/pretest.yml utilities/distro-cmd utilities/packages/ssim2/setup.py utilities/packages/ssim2/ssim2/simlib.py