• Alain Takoudjou's avatar
    Merge branch 'master' into slapos-master-cluster · bcb17e33
    Alain Takoudjou authored
    Conflicts:
    	software/erp5/instance-erp5-input-schema.json
    	stack/erp5/buildout.cfg
    	stack/erp5/haproxy.cfg.in
    	stack/erp5/instance-erp5.cfg.in
    	stack/erp5/instance-mariadb.cfg.in
    	stack/erp5/instance-zope.cfg.in
    	stack/erp5/instance.cfg.in
    	stack/monitor/buildout.cfg
    	stack/monitor/monitor.py.in
    	stack/slapos.cfg
    bcb17e33
instance.cfg.in 6.87 KB