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

docs: examples: fixing merge errors

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-10-05 20:13:28 +02:00
parent 2c96b9fe58
commit 0febf13e96
3 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/examples/interfaces_bridge_igmp_mstp
View File

@@ -31,19 +31,11 @@ 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

12
docs/examples/vlan_aware_bridges/interfaces.with_bonds
View File

@@ -23,11 +23,7 @@ iface uplink1
bond-slaves swp32
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer2
@@ -39,11 +35,7 @@ iface peerlink
bond-slaves swp30 swp31
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4
@@ -55,11 +47,7 @@ iface downlink
bond-slaves swp1
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4

16
docs/examples/vlan_aware_bridges/interfaces.with_clag
View File

@@ -25,11 +25,7 @@ iface spine-bond
bond-slaves glob swp19-22
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4
@@ -42,11 +38,7 @@ iface peer-bond
bond-slaves glob swp23-24
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4
@@ -69,11 +61,7 @@ iface host-bond-01
bond-slaves swp1
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4
@@ -84,11 +72,7 @@ iface host-bond-02
bond-slaves swp2
bond-mode 802.3ad
bond-miimon 100
<<<<<<< HEAD
bond-use-carrier 1
=======
bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1
bond-min-links 1
bond-xmit-hash-policy layer3+4