Merge branch 'erp5' into erp5-generic
authorSebastien Robin <seb@nexedi.com>
Thu, 17 Nov 2011 15:55:22 +0000 (16:55 +0100)
committerSebastien Robin <seb@nexedi.com>
Thu, 17 Nov 2011 15:55:22 +0000 (16:55 +0100)
commitd2f5c4f876fa8c49d153a7a5a4c6a2ce9507c218
tree4736a027e5bd2230b3c704227a24d182ce208b0d
parent7171f3654bf7418326f08d4ec71e3291fcdbdacc
parentcb99a2fa2306821a626de8a81ec5615a133d71c3
Merge branch 'erp5' into erp5-generic

Conflicts:
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/template/initmysql.sql.in
slapos/recipe/erp5/template/mysql-init-database.sql.in
slapos/recipe/generic_mysql/template/initmysql.sql.in
software/erp5/instance.cfg
software/erp5/software.cfg
setup.py
slapos/recipe/generic_mysql/__init__.py
slapos/recipe/generic_mysql/template/my.cnf.in
software/erp5/instance-mariadb.cfg
software/erp5/software.cfg
stack/erp5.cfg