Merge slapos_rest_api_v1 into slapos_rest_api.

master/bt5/slapos_erp5/bt/dependency_list

@@ -2,5 +2,5 @@ slapos_category
 slapos_cloud
 slapos_slap_tool
 slapos_cache
-slapos_rest_api_v1
+slapos_rest_api
 slapos_pdm
\ No newline at end of file

master/bt5/slapos_erp5/bt/revision

-27
+28
\ No newline at end of file

master/bt5/slapos_rest_api/bt/revision

-7
+8
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/copyright_list

-2012 Nexedi S.A.
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/dependency_list

-slapos_rest_api
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/description

-Version 1 of REST API.
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/license

-GPL
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/revision

-28
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/template_format_version

-1
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/template_update_tool

-1
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/title

-slapos_rest_api_v1
\ No newline at end of file

master/bt5/slapos_rest_api_v1/bt/version

-0.1
\ No newline at end of file

master/bt5/vifib_erp5/bt/dependency_list

@@ -22,7 +22,6 @@ vifib_payzen
 vifib_slap
 vifib_slapos_accounting
 vifib_slapos_capacity
-slapos_rest_api_v1
 slapos_pdm
 vifib_upgrader
 vifib_web

master/bt5/vifib_erp5/bt/revision

-534
+535
\ No newline at end of file

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml

@@ -118,7 +118,6 @@ REQUIRED_BT5_ID_LIST = (\n
   \'vifib_slapos_capacity\',\n
   \'slapos_rest_api_tool_portal_type\',\n
   \'slapos_rest_api\',\n
-  \'slapos_rest_api_v1\',\n
   \'vifib_erp5\',\n
   \'vifib_data\',\n
   \'vifib_data_web\',\n

master/bt5/vifib_upgrader/bt/revision

-159
+160
\ No newline at end of file

master/product/SlapOS/tests/testSlapOSMixin.py

@@ -136,7 +136,6 @@ class testSlapOSMixin(Products.Vifib.tests.VifibMixin.testVifibMixin):
       'slapos_category',
       'slapos_rest_api_tool_portal_type',
       'slapos_rest_api',
-      'slapos_rest_api_v1',
       'slapos_pdm',
       'slapos_erp5',
     ]

master/product/Vifib/tests/VifibMixin.py

@@ -110,7 +110,6 @@ class testVifibMixin(ERP5TypeTestCase):
       'vifib_data',
       'slapos_configurator',
       'erp5_ui_test_core',
-      'slapos_rest_api_v1',
       'slapos_erp5',
       'vifib_web',
       'vifib_upgrader',

master/tests/__init__.py

@@ -6,8 +6,6 @@ class VIFIB(SavedTestSuite, ProjectTestSuite):
   _bt_list = [
     'slapos_cloud',
     'slapos_rest_api',
-    'slapos_rest_api_v1',
-    'slapos_rest_api_tool_portal_type',
     'vifib_base',
     'vifib_data',
     'slapos_category',
@@ -25,5 +23,5 @@ class SlapOSCloud(SavedTestSuite, ProjectTestSuite):
   _saved_test_id = 'Products.SlapOS.tests.testSlapOSMixin.testSlapOSMixin'
   _bt_list = [
     'slapos_cloud',
-    'slapos_rest_api_v1',
+    'slapos_rest_api',
   ]