Commit b442860f authored by Romain Courteaud's avatar Romain Courteaud

Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094

parents 739c1f1c 1f018bca
......@@ -63,7 +63,7 @@ port = 12001
ip = $${slap-network-information:local-ipv4}
zodb-cache-size = 5000
thread-amount = 4
zodb-path = $${directory:zodb}/main.cfg
zodb-path = $${directory:zodb}/main.fs
deadlock-path = /manage_debug_threads
# Paths
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment