Commit b049f8e6 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour

Merge branch 'master' into dev

Conflicts:
	generators/input/sites/nancy/clusters/griffon/griffon.rb
parents 32d097ba 91771503
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-1-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-10-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-15-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-16-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-17-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-18-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-19-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-2-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-20-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-21-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-22-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-23-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-24-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-25-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-26-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-27-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-28-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-29-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-3-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-4-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-5-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-58-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-59-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-6-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-60-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-7-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-8-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
......@@ -74,7 +74,6 @@
"management": false,
"mountable": false,
"mounted": false,
"network_address": "griffon-9-ib0.nancy.grid5000.fr",
"rate": 10000000000,
"switch": "sgriffonib",
"vendor": "Mellanox",
......
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