git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding and formatting documentation for Sphinx.
[sfa.git]
/
sfa
/
generic
/
iotlab.py
diff --git
a/sfa/generic/iotlab.py
b/sfa/generic/iotlab.py
index
7ca346b
..
d5636a7
100644
(file)
--- a/
sfa/generic/iotlab.py
+++ b/
sfa/generic/iotlab.py
@@
-30,13
+30,8
@@
class iotlab (Generic):
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
-<<<<<<< HEAD:sfa/generic/slab.py
- import sfa.managers.v2_to_v3_adapter
- return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
-=======
import sfa.iotlab.iotlabdriver
return sfa.iotlab.iotlabdriver.IotlabDriver
import sfa.iotlab.iotlabdriver
return sfa.iotlab.iotlabdriver.IotlabDriver
->>>>>>> 7cb1e78... Renaming Senslab into Iotlab.:sfa/generic/iotlab.py
# iotlab does not have a component manager yet
# manager class
# iotlab does not have a component manager yet
# manager class
@@
-44,4
+39,4
@@
class iotlab (Generic):
return None
# driver_class
def component_driver_class (self):
return None
# driver_class
def component_driver_class (self):
- return None
+ return None
\ No newline at end of file