Merge branch 'iotlab_fixes' into geni-v3
authorLoic Baron <sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 14:40:15 +0000 (16:40 +0200)
committerLoic Baron <sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 14:40:15 +0000 (16:40 +0200)
commit95015fd08e08729c3aaeec2c000995595ea7a7e0
tree8fc6ed225d29741f40a8c898b4ae151c9fa73320
parent4f9d407d0ce159bdb359e9ab500bf88b5f586e62
parent5aac9d53264460afd75bfd0a3d0d2ec0ae5bb02a
Merge branch 'iotlab_fixes' into geni-v3

Conflicts:
sfa/iotlab/OARrestapi.py
sfa/iotlab/iotlabaggregate.py
sfa/iotlab/iotlabdriver.py
sfa/iotlab/iotlabshell.py
sfa/iotlab/iotlabslices.py
sfa/iotlab/LDAPapi.py