From: Ludovic CHEVALIER Date: Tue, 24 Dec 2013 17:04:45 +0000 (+0100) Subject: Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=aea9e28a65a85d9bdaec714338e9b146ab00c9c5;hp=6168bf31b14315144dd6df03d98b4e1ed06f8da2 Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers --- diff --git a/etc/gitolite b/etc/gitolite index 0473794..132556f 160000 --- a/etc/gitolite +++ b/etc/gitolite @@ -1 +1 @@ -Subproject commit 04737948cf0a1873ecb5183b2ad7a79b5c633045 +Subproject commit 132556f65d436a37502040817318d429d16c2ca7 diff --git a/etc/sv/openerp7_burette/run b/etc/sv/openerp7_burette/run index b658341..4b6392d 100755 --- a/etc/sv/openerp7_burette/run +++ b/etc/sv/openerp7_burette/run @@ -52,7 +52,6 @@ for db in \ --database="${sv}_$db" \ --db_host=/run/postgresql \ --db_user="$sv" \ - --debug \ --init=remembership,pos_membership,bikecoop,no_db_management \ --load-language=fr_FR \ --no-xmlrpcs \ diff --git a/etc/sv/openerp_lhc_demo/run b/etc/sv/openerp_lhc_demo/run index d321161..38f73d2 100755 --- a/etc/sv/openerp_lhc_demo/run +++ b/etc/sv/openerp_lhc_demo/run @@ -15,7 +15,6 @@ test -e /etc/openerp/"${sv#openerp_}"/server.conf || --database="$sv" \ --db_host=/run/postgresql \ --db_user="$sv" \ - --debug \ --init=remembership,pos_membership,bikecoop,no_db_management \ --load-language=fr_FR \ --no-database-list \ diff --git a/etc/sv/openerp_server_lhc/run b/etc/sv/openerp_server_lhc/run index aaf7762..19f8bda 100755 --- a/etc/sv/openerp_server_lhc/run +++ b/etc/sv/openerp_server_lhc/run @@ -15,7 +15,6 @@ test -e /etc/openerp/"${sv#openerp_}"/server.conf || --database="$sv" \ --db_host=/run/postgresql \ --db_user="$sv" \ - --debug \ --init=lhc_custom_oe \ --load-language=fr_FR \ --netrpc-interface=127.0.0.1 \