1. 22 Oct, 2015 1 commit
    • 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
  2. 21 Oct, 2015 5 commits
  3. 19 Oct, 2015 3 commits
  4. 18 Oct, 2015 1 commit
  5. 16 Oct, 2015 1 commit
  6. 15 Oct, 2015 12 commits
  7. 14 Oct, 2015 1 commit
  8. 13 Oct, 2015 3 commits
  9. 12 Oct, 2015 6 commits
  10. 09 Oct, 2015 2 commits
  11. 08 Oct, 2015 5 commits