Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
12d8601b
Commit
12d8601b
authored
Sep 28, 2024
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "stack/erp5: use READ COMMITTED isolation level in cmf_activity_sql_connection."
This reverts commit
44243a87
.
parent
c82921dc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+0
-1
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+1
-1
No files found.
stack/erp5/buildout.hash.cfg
View file @
12d8601b
...
@@ -34,7 +34,7 @@ md5sum = 97b70cdd32616e21cbf4e2f2e6828526
...
@@ -34,7 +34,7 @@ md5sum = 97b70cdd32616e21cbf4e2f2e6828526
[template-zope-conf]
[template-zope-conf]
filename = zope.conf.in
filename = zope.conf.in
md5sum =
26b323080f2d53a302e178349268e112
md5sum =
07c9d4ced9945fe3ad80e75b493af29e
[site-zcml]
[site-zcml]
filename = site.zcml
filename = site.zcml
...
@@ -94,7 +94,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
...
@@ -94,7 +94,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
88a7e8a669e787dcce490ddbd16611bb
md5sum =
9547bacad0635b0f64cac48f15c4e9ae
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-zope.cfg.in
View file @
12d8601b
...
@@ -537,7 +537,6 @@ inline =
...
@@ -537,7 +537,6 @@ inline =
command-name = runUnitTest
command-name = runUnitTest
command-line-extra =
command-line-extra =
--erp5_sql_connection_string '{{ connection_string_list[0] }}'
--erp5_sql_connection_string '{{ connection_string_list[0] }}'
--cmf_activity_sql_connection_string '!READ-COMMITTED {{ connection_string_list[0] }}'
--extra_sql_connection_string_list '{{ ','.join(connection_string_list[1:]) }}'
--extra_sql_connection_string_list '{{ ','.join(connection_string_list[1:]) }}'
--zserver {{ test_runner_address_list[0][0] ~ ':' ~ test_runner_address_list[0][1] }}
--zserver {{ test_runner_address_list[0][0] ~ ':' ~ test_runner_address_list[0][1] }}
--zserver_frontend_url {{ slapparameter_dict['test-runner-balancer-url-list'][0] }}
--zserver_frontend_url {{ slapparameter_dict['test-runner-balancer-url-list'][0] }}
...
...
stack/erp5/zope.conf.in
View file @
12d8601b
...
@@ -71,7 +71,7 @@ trusted-proxy 0.0.0.0
...
@@ -71,7 +71,7 @@ trusted-proxy 0.0.0.0
id {{ parameter_dict['site-id'] }}
id {{ parameter_dict['site-id'] }}
owner {{ parameter_dict['inituser'] }}
owner {{ parameter_dict['inituser'] }}
erp5_sql_connection_string {{ sql_connection_string }}
erp5_sql_connection_string {{ sql_connection_string }}
cmf_activity_sql_connection_string
!READ-COMMITTED
{{ sql_connection_string }}
cmf_activity_sql_connection_string {{ sql_connection_string }}
bt5_repository_url {{ ' '.join(bt5_repository_url) }}
bt5_repository_url {{ ' '.join(bt5_repository_url) }}
bt5 {{ parameter_dict['bt5'] }}
bt5 {{ parameter_dict['bt5'] }}
{%- if parameter_dict['id-store-interval'] != None %}
{%- if parameter_dict['id-store-interval'] != None %}
...
...
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