slapos/recipe/generic_mysql/template/my.cnf.in · 030c36f133b467d31eab11e6fbe3ae6290b3f933 · nexedi / slapos

Merge branch 'erp5' into erp5-generic · d2f5c4f8

Sebastien Robin authored Nov 17, 2011

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

d2f5c4f8

my.cnf.in 1.71 KB

Replace my.cnf.in