Commit 16390ab7 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

Merge branch 'master' into dev

Conflicts:
	generators/input/sites/nancy/clusters/griffon/griffon.rb
parents eb7256ce 6eb14768
......@@ -64,15 +64,13 @@
"bridged": false,
"device": "eth2",
"driver": "myri10ge",
"enabled": true,
"enabled": false,
"interface": "Ethernet",
"mac": "00:60:dd:46:84:b8",
"management": false,
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
"switch_port": null,
"vendor": "myrinet",
"version": "Myri-10G"
},
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -124,7 +124,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment