Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

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
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
"smt_size": 12 "smt_size": 12
}, },
"bios": { "bios": {
"release_date": "05/10/2012", "release_date": "01/22/2016",
"vendor": "Dell Inc.", "vendor": "Dell Inc.",
"version": "1.2.6" "version": 2.5
}, },
"chassis": { "chassis": {
"manufacturer": "Dell Inc.", "manufacturer": "Dell Inc.",
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"vendor": "Intel Corporation" "vendor": "Intel Corporation"
}, },
{ {
"bridged": true, "bridged": false,
"device": "ib0", "device": "ib0",
"driver": "mlx4_core", "driver": "mlx4_core",
"enabled": true, "enabled": true,
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:b7", "mac": "00:60:dd:46:84:b7",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": "sgriffon1",
"switch_port": "Ten-GigabitEthernet1/1/1",
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:b9", "mac": "00:60:dd:46:84:b9",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": "sgriffon1",
"switch_port": "Ten-GigabitEthernet1/2/2",
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
"bridged": false, "bridged": false,
"device": "eth2", "device": "eth2",
"driver": "myri10ge", "driver": "myri10ge",
"enabled": true, "enabled": false,
"interface": "Ethernet", "interface": "Ethernet",
"mac": "00:60:dd:46:84:a8", "mac": "00:60:dd:46:84:a8",
"management": false, "management": false,
"mountable": true, "mountable": false,
"mounted": false, "mounted": false,
"rate": 10000000000, "rate": 10000000000,
"switch": null,
"switch_port": null,
"vendor": "myrinet", "vendor": "myrinet",
"version": "Myri-10G" "version": "Myri-10G"
}, },
......
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