1. 01 Nov, 2011 2 commits
  2. 31 Oct, 2011 3 commits
  3. 26 Oct, 2011 1 commit
  4. 25 Oct, 2011 3 commits
  5. 21 Oct, 2011 2 commits
  6. 20 Oct, 2011 5 commits
  7. 17 Oct, 2011 5 commits
  8. 14 Oct, 2011 4 commits
    • Kazuhiko Shiozaki's avatar
    • Kazuhiko Shiozaki's avatar
    • Antoine Catton's avatar
      Merge my work from generic-lamp in order to provide a base for generic · 2adefe1b
      Antoine Catton authored
      recipes.
      
      Squashed commit of the following:
      
      commit 47c90b0c79dc758a581e5401a83683ae4d7b0d17
      Author: Antoine Catton <acatton@tiolive.com>
      Date:   Fri Oct 14 17:26:27 2011 +0200
      
          Huge underscore to dashe refactoring
      
      commit 609422d8bc8a500435692de6686411c01c036e8f
      Author: Antoine Catton <acatton@tiolive.com>
      Date:   Fri Oct 14 17:04:52 2011 +0200
      
          Reset lamp recipe as it is in master branch
      
      commit 37ae2ed0b0630a802b46aae361f538eeb7130952
      Author: Antoine Catton <acatton@tiolive.com>
      Date:   Fri Oct 14 16:51:22 2011 +0200
      
          Make slapgrid-sr works
      
      commit f35677b711e834239f8c8508ea44ca1432f98091
      Author: Antoine Catton <acatton@tiolive.com>
      Date:   Fri Oct 14 16:16:45 2011 +0200
      
          Add lamp.cfg from master.
      
      commit 75956ad31f8d012502a305f396865505f46672d2
      Author: Łukasz Nowak <luke@nexedi.com>
      Date:   Fri Oct 14 16:19:42 2011 +0200
      
          Typo.
      
      commit 4fe7611cbf688043b9c0462a3b5a17ae3e785e07
      Author: Łukasz Nowak <luke@nexedi.c...
      2adefe1b
    • Romain Courteaud's avatar
      Merge branch 'master' into erp5 · 53c5932d
      Romain Courteaud authored
      Conflicts:
      	component/apache/buildout.cfg
      	component/groonga/buildout.cfg
      	component/imagemagick/buildout.cfg
      	component/mysql-5.1/buildout.cfg
      	component/ncurses/buildout.cfg
      	slapos/recipe/erp5/template/haproxy.cfg.in
      	software/erp5/software.cfg
      	software/vifib/software.cfg
      	stack/erp5.cfg
      53c5932d
  9. 13 Oct, 2011 4 commits
  10. 12 Oct, 2011 6 commits
  11. 10 Oct, 2011 3 commits
  12. 08 Oct, 2011 1 commit
  13. 07 Oct, 2011 1 commit