Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 13:01:29 +0000 (15:01 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 13:01:29 +0000 (15:01 +0200)
commit4a2337e7f70cef81a8de37829aa63fc941c4b96e
treefad359f09c39cb975461f12b7602b279c042cdf5
parent3519c849835dcc5ca47a2e03db24284017254ce6
parentf8c653decd381476c40184f6c6859a4e36a7b12f
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

Conflicts:
sfa/rspecs/rspec.py
sfa/rspecs/rspec.py
testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec