Merge Master in geni-v3 conflict resolution

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index e055790..8ce7dba 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@ packages = [
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
+    'sfa/rspecs/elements/v3',
     'sfa/rspecs/versions',
     'sfa/client',
     'sfa/planetlab',
@@ -43,6 +44,7 @@ packages = [
     'sfa/dummy',
     'sfa/openstack',
     'sfa/federica',
+    'sfa/senslab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
@@ -54,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',
+                              'config/api_versions.xml',
                               'config/sfi_config',
                               'config/topology',
                               'sfa/managers/pl/pl.rng',