Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.core
Commits
5865bb8d
Commit
5865bb8d
authored
Oct 29, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge slapos_rest_api_v1 into slapos_rest_api.
parent
ddbc98d8
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
6 additions
and
21 deletions
+6
-21
master/bt5/slapos_erp5/bt/dependency_list
master/bt5/slapos_erp5/bt/dependency_list
+1
-1
master/bt5/slapos_erp5/bt/revision
master/bt5/slapos_erp5/bt/revision
+1
-1
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
...DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
+0
-0
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.xml
...ocumentTemplateItem/portal_components/SlapOSRestAPIV1.xml
+0
-0
master/bt5/slapos_rest_api/TestTemplateItem/testSlapOSRestAPIV1.py
...5/slapos_rest_api/TestTemplateItem/testSlapOSRestAPIV1.py
+0
-0
master/bt5/slapos_rest_api/bt/revision
master/bt5/slapos_rest_api/bt/revision
+1
-1
master/bt5/slapos_rest_api/bt/template_document_id_list
master/bt5/slapos_rest_api/bt/template_document_id_list
+0
-0
master/bt5/slapos_rest_api/bt/template_test_id_list
master/bt5/slapos_rest_api/bt/template_test_id_list
+0
-0
master/bt5/slapos_rest_api_v1/bt/copyright_list
master/bt5/slapos_rest_api_v1/bt/copyright_list
+0
-1
master/bt5/slapos_rest_api_v1/bt/dependency_list
master/bt5/slapos_rest_api_v1/bt/dependency_list
+0
-1
master/bt5/slapos_rest_api_v1/bt/description
master/bt5/slapos_rest_api_v1/bt/description
+0
-1
master/bt5/slapos_rest_api_v1/bt/license
master/bt5/slapos_rest_api_v1/bt/license
+0
-1
master/bt5/slapos_rest_api_v1/bt/revision
master/bt5/slapos_rest_api_v1/bt/revision
+0
-1
master/bt5/slapos_rest_api_v1/bt/template_format_version
master/bt5/slapos_rest_api_v1/bt/template_format_version
+0
-1
master/bt5/slapos_rest_api_v1/bt/template_update_tool
master/bt5/slapos_rest_api_v1/bt/template_update_tool
+0
-1
master/bt5/slapos_rest_api_v1/bt/title
master/bt5/slapos_rest_api_v1/bt/title
+0
-1
master/bt5/slapos_rest_api_v1/bt/version
master/bt5/slapos_rest_api_v1/bt/version
+0
-1
master/bt5/vifib_erp5/bt/dependency_list
master/bt5/vifib_erp5/bt/dependency_list
+0
-1
master/bt5/vifib_erp5/bt/revision
master/bt5/vifib_erp5/bt/revision
+1
-1
master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
...al_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
+0
-1
master/bt5/vifib_upgrader/bt/revision
master/bt5/vifib_upgrader/bt/revision
+1
-1
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+0
-1
master/product/Vifib/tests/VifibMixin.py
master/product/Vifib/tests/VifibMixin.py
+0
-1
master/tests/__init__.py
master/tests/__init__.py
+1
-3
No files found.
master/bt5/slapos_erp5/bt/dependency_list
View file @
5865bb8d
...
...
@@ -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
View file @
5865bb8d
27
\ No newline at end of file
28
\ No newline at end of file
master/bt5/slapos_rest_api
_v1
/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
→
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.py
View file @
5865bb8d
File moved
master/bt5/slapos_rest_api
_v1
/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.xml
→
master/bt5/slapos_rest_api/DocumentTemplateItem/portal_components/SlapOSRestAPIV1.xml
View file @
5865bb8d
File moved
master/bt5/slapos_rest_api
_v1
/TestTemplateItem/testSlapOSRestAPIV1.py
→
master/bt5/slapos_rest_api/TestTemplateItem/testSlapOSRestAPIV1.py
View file @
5865bb8d
File moved
master/bt5/slapos_rest_api/bt/revision
View file @
5865bb8d
7
\ No newline at end of file
8
\ No newline at end of file
master/bt5/slapos_rest_api
_v1
/bt/template_document_id_list
→
master/bt5/slapos_rest_api/bt/template_document_id_list
View file @
5865bb8d
File moved
master/bt5/slapos_rest_api
_v1
/bt/template_test_id_list
→
master/bt5/slapos_rest_api/bt/template_test_id_list
View file @
5865bb8d
File moved
master/bt5/slapos_rest_api_v1/bt/copyright_list
deleted
100644 → 0
View file @
ddbc98d8
2012 Nexedi S.A.
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/dependency_list
deleted
100644 → 0
View file @
ddbc98d8
slapos_rest_api
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/description
deleted
100644 → 0
View file @
ddbc98d8
Version 1 of REST API.
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/license
deleted
100644 → 0
View file @
ddbc98d8
GPL
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/revision
deleted
100644 → 0
View file @
ddbc98d8
28
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/template_format_version
deleted
100644 → 0
View file @
ddbc98d8
1
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/template_update_tool
deleted
100644 → 0
View file @
ddbc98d8
1
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/title
deleted
100644 → 0
View file @
ddbc98d8
slapos_rest_api_v1
\ No newline at end of file
master/bt5/slapos_rest_api_v1/bt/version
deleted
100644 → 0
View file @
ddbc98d8
0.1
\ No newline at end of file
master/bt5/vifib_erp5/bt/dependency_list
View file @
5865bb8d
...
...
@@ -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
View file @
5865bb8d
534
\ No newline at end of file
535
\ No newline at end of file
master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
View file @
5865bb8d
...
...
@@ -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
View file @
5865bb8d
159
\ No newline at end of file
160
\ No newline at end of file
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
5865bb8d
...
...
@@ -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
View file @
5865bb8d
...
...
@@ -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
View file @
5865bb8d
...
...
@@ -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'
,
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment