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
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
65d4fed
..
8ce7dba
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-33,18
+33,10
@@
packages = [
'sfa/generic',
'sfa/managers',
'sfa/importer',
'sfa/generic',
'sfa/managers',
'sfa/importer',
-
-
-
- 'sfa/senslab',
-
-
-
-
-
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
+ 'sfa/rspecs/elements/v3',
'sfa/rspecs/versions',
'sfa/client',
'sfa/planetlab',
'sfa/rspecs/versions',
'sfa/client',
'sfa/planetlab',
@@
-52,6
+44,7
@@
packages = [
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
'sfa/dummy',
'sfa/openstack',
'sfa/federica',
+ 'sfa/senslab',
'sfatables',
'sfatables/commands',
'sfatables/processors',
'sfatables',
'sfatables/commands',
'sfatables/processors',
@@
-63,6
+56,7
@@
if not os.path.isfile('/etc/redhat-release'): initscripts.append('functions.sfa'
data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
'config/registries.xml',
'config/default_config.xml',
data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
'config/registries.xml',
'config/default_config.xml',
+ 'config/api_versions.xml',
'config/sfi_config',
'config/topology',
'sfa/managers/pl/pl.rng',
'config/sfi_config',
'config/topology',
'sfa/managers/pl/pl.rng',