Merge vifib_mysql_innodb_catalog into slapos_cloud.

master/bt5/slapos_cloud/bt/revision

-124
\ No newline at end of file
+125
\ No newline at end of file

master/bt5/vifib_configurator/SkinTemplateItem/portal_skins/vifib_configurator/BusinessConfiguration_setupVifibStandardBT5.xml

@@ -53,7 +53,7 @@
             <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
 \n
 bt5_update_catalog_list = (\'erp5_ingestion_mysql_innodb_catalog\',\n
-                           \'vifib_mysql_innodb_catalog\')\n
+                           \'slapos_cloud\')\n
 \n
 bt5_installation_list = bt5_update_catalog_list + (\'vifib_erp5\',)\n
  \n

master/bt5/vifib_erp5/bt/dependency_list

@@ -19,7 +19,6 @@ slapos_category
 vifib_data_payzen
 vifib_data_simulation
 vifib_data_web
-vifib_mysql_innodb_catalog
 vifib_open_trade
 vifib_payzen
 vifib_slap
@@ -29,4 +28,4 @@ vifib_slapos_rest_api_v1
 vifib_software_pdm
 vifib_upgrader
 vifib_web
-slapos_erp5
\ No newline at end of file
+slapos_erp5

master/bt5/vifib_mysql_innodb_catalog/bt/change_log

-2010-09-04 Lukasz Nowak
-* catalog Software Release in email table, which provides url_string
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/copyright_list

-Nexedi SA
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/dependency_list

-erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/description

-Vifib related catalog modifications
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/license

-GPL
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/revision

-47
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/template_format_version

-1
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/title

-vifib_mysql_innodb_catalog
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/bt/version

-Vifib 0.5
\ No newline at end of file

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

@@ -100,7 +100,6 @@ REQUIRED_BT5_ID_LIST = (\n
   \'erp5_project\',\n
   \'erp5_credential_oauth2\',\n
 # vifib\n
-  \'vifib_mysql_innodb_catalog\',\n
   \'vifib_base\',\n
   \'vifib_core\',\n
   \'vifib_data_category\',\n

master/product/Vifib/tests/VifibMixin.py

@@ -114,7 +114,6 @@ class testVifibMixin(ERP5TypeTestCase):
       'vifib_slapos_rest_api_v1',
       'vifib_slapos_capacity',
       'vifib_slapos_accounting',
-      'vifib_mysql_innodb_catalog',
       'vifib_data_web',
       'vifib_data_simulation',
       'vifib_data_payzen',

master/tests/__init__.py

@@ -15,7 +15,6 @@ class VIFIB(SavedTestSuite, ProjectTestSuite):
     'vifib_data_web',
     'slapos_erp5',
     'vifib_erp5',
-    'vifib_mysql_innodb_catalog',
     'vifib_open_trade',
     'vifib_slap',
     'vifib_software_pdm',