1. 05 Dec, 2011 1 commit
  2. 28 Nov, 2011 2 commits
  3. 24 Nov, 2011 11 commits
  4. 23 Nov, 2011 7 commits
  5. 22 Nov, 2011 3 commits
  6. 18 Nov, 2011 1 commit
  7. 16 Nov, 2011 6 commits
  8. 11 Nov, 2011 5 commits
  9. 10 Nov, 2011 4 commits
    • Cédric de Saint Martin's avatar
      Freeze websockify · 92b0b9ef
      Cédric de Saint Martin authored
      92b0b9ef
    • Łukasz Nowak's avatar
      Merge branch 'master' into erp5testnode · 6c87c047
      Łukasz Nowak authored
      Conflicts:
      	stack/erp5.cfg
      6c87c047
    • Cédric de Saint Martin's avatar
      Release slapos.cookbook-0.35 · 7d45a338
      Cédric de Saint Martin authored
      7d45a338
    • Cédric de Saint Martin's avatar
      Merge branch 'kvm'. Lot of conflicts. · 156fdca4
      Cédric de Saint Martin authored
      Some branch must have badly used squash commit. Maybe me.
      I hate me.
      
      Conflicts:
      	CHANGES.txt
      	component/apache-php/buildout.cfg
      	component/gcc/buildout.cfg
      	component/java/buildout.cfg
      	component/slapos/buildout.cfg
      	component/stunnel/buildout.cfg
      	setup.py
      	slapos/recipe/kvm/__init__.py
      	slapos/recipe/lamp/__init__.py
      	slapos/recipe/lamp/template/apache.in
      	slapos/recipe/lamp/template/php.ini.in
      	slapos/recipe/librecipe/__init__.py
      	slapos/recipe/mysql/__init__.py
      	software/davstorage/instance.cfg
      	software/davstorage/software.cfg
      	software/erp5/software.cfg
      	software/kvm/software.cfg
      	software/lamp-template/instance.cfg
      	software/lamp-template/software.cfg
      	software/mariadb/instance.cfg
      	software/mariadb/software.cfg
      	software/phpmyadmin/software.cfg
      	software/slaprunner/software.cfg
      	software/wordpress/instance.cfg
      	software/wordpress/software.cfg
      156fdca4