]> git.proxmox.com Git - mirror_ifupdown2.git/commit
Merge branch 'CumulusLinux-2.0_br'
authorJohn Berezovik <johnberezovik@cumulusnetworks.com>
Tue, 11 Feb 2014 22:12:16 +0000 (14:12 -0800)
committerJohn Berezovik <johnberezovik@cumulusnetworks.com>
Tue, 11 Feb 2014 22:12:16 +0000 (14:12 -0800)
commite176f1d45918c5a98225a1dd54c6921a57ca171e
tree6f0f29cdd618893d7a445e6cc9610a12aaebdcec
parent360d5f8eac485099c54fc2a75a056266166cda30
parentbc019e14049c7b6634b527d52b7f6975bb2204f5
Merge branch 'CumulusLinux-2.0_br'

Conflicts:
build-config/conf/snapshot-manifest-powerpc
build-config/make/kernel.make
modules/accton_as5610_52x_cpld.c
packages/cl-platform-config/usr/share/platform-config/accton/as5610_52x/etc/bcm.d/default_config_values
packages/cl-platform-config/usr/share/platform-config/accton/as5610_52x/hw_init.d/S10gpio_init.sh
packages/cl-utilities/dist-packages/cumulus/platformdb.py
packages/cl-utilities/dist-packages/cumulus/platforms/accton.py
packages/ifupdown2-addons/addons/bridge.py
packages/ifupdown2-addons/addons/ifenslave.py
packages/ifupdown2-addons/addons/inet.py
packages/ifupdown2-addons/addons/inet6.py
packages/ifupdown2-addons/addons/mstpctl.py
packages/ifupdown2-addons/addons/vlan.py
packages/ifupdown2-addons/pkg/base.py
packages/ifupdown2-addons/pkg/bridgeutils.py
packages/ifupdown2-addons/pkg/cache.py
packages/ifupdown2-addons/pkg/ifenslaveutil.py
packages/ifupdown2-addons/pkg/iproute2.py
packages/ifupdown2-addons/pkg/modulebase.py
packages/ifupdown2-addons/pkg/mstpctlutil.py
packages/ifupdown2/TODO
packages/ifupdown2/init.d/networking
packages/ifupdown2/pkg/graph.py
packages/ifupdown2/pkg/iface.py
packages/ifupdown2/pkg/ifupdownmain.py
packages/ifupdown2/pkg/networkinterfaces.py
packages/ifupdown2/pkg/scheduler.py
packages/ifupdown2/sbin/ifupdown
patches/kernel/driver-ds100df410-retimer.patch
patches/kernel/platform-accton-as5610_52x.patch
patches/kernel/platform-cel-p2020.patch
patches/kernel/platform-powerpc-85xx-Makefile.patch
patches/kernel/platform-quanta-ly6-p2020.patch
patches/kernel/series
patches/mstpd/igmp_snooop_ifupdown.patch
patches/mstpd/series
patches/quagga/series
switchd/debian/switchd.default
switchd/hal_acl_bcm.c
switchd/hal_bcm.h
switchd/switchd.c