Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-02-28 14:25:38 +01:00
commit 1ab9ca2333
29 files changed
+548 -55

No files matched your search

+2 -2
View File
@@ -30,8 +30,8 @@
"name": "IOU1",
"node_id": "aaeb2288-a7d8-42a9-b9d8-c42ab464a390",
"node_type": "iou",
"port_name_format": "Ethernet{0}",
"port_segment_size": 0,
"port_name_format": "Ethernet{segment0}/{port0}",
"port_segment_size": 4,
"first_port_name": null,
"properties": {
"ethernet_adapters": 2,