1. 24 Mar, 2016 6 commits
    • Jérémie Gaidamour's avatar
    • Jérémie Gaidamour's avatar
      [nancy] grisou, graphene, talc, griffon - Merge recent commits · 06a031fd
      Jérémie Gaidamour authored
      ie. fixed grisou50-51, graphene-45 and eth0 rate of talc and griffon nodes.
      06a031fd
    • Jérémie Gaidamour's avatar
      [dev] Removed old_generators/ · c1c38fe5
      Jérémie Gaidamour authored
      c1c38fe5
    • Jérémie Gaidamour's avatar
      Merge branch 'master' into dev · f35be460
      Jérémie Gaidamour authored
      Conflicts:
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-10.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-102.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-103.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-104.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-105.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-106.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-107.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-108.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-11.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-110.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-111.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-112.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-113.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-114.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-115.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-116.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-117.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-118.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-12.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-120.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-121.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-122.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-123.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-125.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-126.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-127.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-128.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-13.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-130.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-131.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-132.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-14.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-15.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-17.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-19.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-2.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-20.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-21.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-22.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-23.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-25.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-27.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-29.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-3.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-30.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-31.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-32.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-34.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-35.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-36.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-37.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-38.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-39.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-4.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-40.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-41.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-42.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-43.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-44.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-45.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-47.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-48.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-49.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-5.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-50.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-51.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-52.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-53.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-54.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-55.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-56.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-57.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-58.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-59.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-6.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-60.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-61.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-62.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-64.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-66.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-67.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-69.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-7.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-71.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-74.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-75.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-76.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-77.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-78.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-79.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-8.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-80.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-81.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-82.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-83.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-84.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-85.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-86.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-87.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-88.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-9.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-90.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-91.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-93.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-94.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-95.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-96.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-97.json
      	data/grid5000/sites/nancy/clusters/talc/nodes/talc-99.json
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
      	generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
      	generators/input/sites/nancy/clusters/grisou/grisou.rb
      	input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
      	input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
      	input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
      f35be460
    • PARISOT Clement's avatar
      af590351
    • Jérémie Gaidamour's avatar
      [all] Fixed input files globally · 6f410eff
      Jérémie Gaidamour authored
      6f410eff
  2. 23 Mar, 2016 12 commits
  3. 21 Mar, 2016 10 commits
  4. 17 Mar, 2016 1 commit
  5. 16 Mar, 2016 11 commits