git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f9d407 5aac9d5)
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)
Conflicts:
sfa/iotlab/OARrestapi.py
sfa/iotlab/iotlabaggregate.py
sfa/iotlab/iotlabdriver.py
sfa/iotlab/iotlabshell.py
sfa/iotlab/iotlabslices.py

1  2 
sfa/iotlab/LDAPapi.py patch | diff1 | diff2 | blob | history

diff --cc sfa/iotlab/LDAPapi.py
Simple merge
sfa