Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorLoic Baron <sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 08:15:32 +0000 (10:15 +0200)
committerLoic Baron <sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 08:15:32 +0000 (10:15 +0200)
commit4f9d407d0ce159bdb359e9ab500bf88b5f586e62
tree554cad5f8fdd02d3f3db3c004ab204a8b4bd7cee
parent69539c59d82c4ff3f7ae299811e056f1f280e710
parent4a2337e7f70cef81a8de37829aa63fc941c4b96e
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

Conflicts:
sfa/iotlab/iotlabaggregate.py
sfa/iotlab/iotlabslices.py
sfa/iotlab/iotlabaggregate.py
sfa/iotlab/iotlabdriver.py
sfa/iotlab/iotlabslices.py