Merge remote-tracking branch 'azure/master' into bf-master

This commit is contained in:
kram 2017-12-14 10:52:29 -08:00
commit 771b9df529
2 changed files with 55 additions and 56 deletions

View File

@ -1,4 +1,3 @@
# 48x25G + 6x100G
# name lanes alias # name lanes alias
Ethernet0 2 Ethernet0 Ethernet0 2 Ethernet0
Ethernet4 1 Ethernet4 Ethernet4 1 Ethernet4

@ -1 +1 @@
Subproject commit be91f161b290328773b98f1e21f7feee797ce91c Subproject commit 8677d5f457c9a20f0fac2a4fdde569a8338c77e3