stack/erp5/instance-cloudoo.cfg.in · 8897634306017caa0c658528eccc1e233879f1d0 · Eteri / slapos

Merge branch 'master' into erp5-cluster · 690be0d0

Kazuhiko Shiozaki authored Jan 22, 2015

Conflicts:
	stack/erp5/buildout.cfg
	stack/erp5/instance-kumofs.cfg.in
	stack/erp5/instance-mariadb.cfg.in
	stack/erp5/instance-memcached.cfg.in
	stack/erp5/instance-tidstorage.cfg.in
	stack/erp5/instance-varnish.cfg.in

690be0d0

instance-cloudoo.cfg.in 3.87 KB

Replace instance-cloudoo.cfg.in