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

docs: examples: interfaces: fixing merge error

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-10-05 20:06:19 +02:00
parent baadcc71e4
commit ea18ed2c47
1 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
docs/examples/interfaces
View File

@ -21,27 +21,15 @@ iface swp30
alias "test network" alias "test network"
link-duplex full link-duplex full
link-speed 1000 link-speed 1000
<<<<<<< HEAD
link-autoneg off
=======
link-autoneg no link-autoneg no
>>>>>>> cumulus/dev
# bond interface # bond interface
auto bond3 auto bond3
iface bond3 inet static iface bond3 inet static
<<<<<<< HEAD
address 100.0.0.4/16
bond-slaves swp1 swp2
bond-mode 802.3ad
bond-miimon 100
bond-use-carrier 1
=======
bond-slaves swp1 swp2 bond-slaves swp1 swp2
bond-mode 802.3ad bond-mode 802.3ad
bond-miimon 100 bond-miimon 100
bond-use-carrier yes bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1 bond-lacp-rate 1
bond-min-links 1 bond-min-links 1
bond-xmit_hash_policy layer3+4 bond-xmit_hash_policy layer3+4
@ -49,27 +37,15 @@ iface bond3 inet static
# bond interface # bond interface
auto bond4 auto bond4
iface bond4 inet static iface bond4 inet static
<<<<<<< HEAD
address 100.0.0.6/16
bond-slaves swp3 swp4
bond-mode 802.3ad
bond-miimon 100
bond-use-carrier 1
=======
bond-slaves swp3 swp4 bond-slaves swp3 swp4
bond-mode 802.3ad bond-mode 802.3ad
bond-miimon 100 bond-miimon 100
bond-use-carrier yes bond-use-carrier yes
>>>>>>> cumulus/dev
bond-lacp-rate 1 bond-lacp-rate 1
bond-min-links 1 bond-min-links 1
bond-xmit_hash_policy layer3+4 bond-xmit_hash_policy layer3+4
<<<<<<< HEAD
# bond interface
=======
# bridge interface # bridge interface
>>>>>>> cumulus/dev
auto br0 auto br0
iface br0 iface br0
address 12.0.0.4/24 address 12.0.0.4/24
@ -81,17 +57,9 @@ iface br0
# vlan interface on bond # vlan interface on bond
auto bond3.2000 auto bond3.2000
iface bond3.2000 inet static iface bond3.2000 inet static
<<<<<<< HEAD
address 100.1.0.4/16
auto bond4.2000 auto bond4.2000
iface bond4.2000 inet static iface bond4.2000 inet static
address 100.1.0.6/16
=======
auto bond4.2000
iface bond4.2000 inet static
>>>>>>> cumulus/dev
auto br2000 auto br2000
iface br2000 inet6 static iface br2000 inet6 static