mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Merge remote-tracking branch 'cumulus/dev'

Browse Source
This commit is contained in:
Roopa Prabhu
2016-06-06 13:18:29 -07:00
parent 1edfb8a39b c9b929f97e
commit d6dd6fe653
85 changed files with 10702 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/examples/interfaces_bridge_igmp_mstp
View File

@ -31,11 +31,19 @@ iface br-300 inet static
mstpctl-hello 2
mstpctl-portnetwork swp13.300=no
bridge-mclmc 3
<<<<<<< HEAD
bridge-mcrouter 0
bridge-mcsnoop 1
bridge-mcsqc 3
bridge-mcqifaddr 1
bridge-mcquerier 1
=======
bridge-mcrouter no
bridge-mcsnoop yes
bridge-mcsqc 3
bridge-mcqifaddr yes
bridge-mcquerier yes
>>>>>>> cumulus/dev
bridge-hashel 3
bridge-hashmax 4
bridge-mclmi 3