Merge branch 'erp5'
[slapos.git] / stack / lapp / apache / instance-apache-php.cfg.in
2013-03-15 Kazuhiko ShiozakiMerge branch 'erp5'
2013-03-14 Marco Marianiimplemented new instance structure from lamp stack
2013-03-05 Cédric de Saint... Merge branch 'agent'
2013-02-13 Cédric de Saint... Merge remote-tracking branch 'viktor/master'
2013-02-05 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-02-01 Gabriel MonneratMerge branch 'erp5' into master
2013-01-29 Cédric de Saint... Merge branch 'erp5-component-merge' into erp5-component
2013-01-24 Cédric de Saint... Merge branch 'master' into slaprunner
2013-01-15 Cédric de Saint... Merge remote-tracking branch 'origin/erp5-component...
2013-01-11 Cédric de Saint... Merge branch 'master' into erp5-component
2013-01-10 Cédric de Saint... Merge branch 'lamp'
2013-01-10 Marco Marianiremoved empty, unused configuration file, simplified...
2013-01-08 Cédric de Saint... Merge remote-tracking branch 'origin/master' into lamp
2013-01-08 Cédric de Saint... Merge branch 'master' into lamp
2013-01-08 Marco MarianiMerge remote-tracking branch 'origin/master' into lapp...
2013-01-04 Marco Marianimoved long-running scripts to etc/service
2012-12-14 Cédric de Saint... Merge branch 'erp5'
2012-12-13 Cédric de Saint... Merge branch 'agent'
2012-12-04 Cédric de Saint... Merge branch 'master' into slaprunner
2012-12-04 Cédric de Saint... Merge branch 'lapp-resilient3'
2012-12-03 Marco Marianiuse slapmonitor-xml in place of slapreport
2012-11-26 Marco MarianiMerge remote-tracking branch 'origin/master' into lapp...
2012-11-22 Marco MarianiMerge remote-tracking branch 'origin/resiliency_annotat...
2012-11-21 Marco MarianiMerge branch 'resiliency_annotated' into lapp-resilient2
2012-11-20 Marco MarianiMerge branch 'resiliency_annotated' into lapp
2012-11-20 Marco Marianirenamed template -> instance, etc.
2012-11-19 Marco Marianimoved sections, comments
2012-11-15 Marco Marianirearrange sections, minimize diffs
2012-11-14 Marco Marianimade lapp stack independent from maarch; comments
2012-11-13 Marco Marianimoved apache, postgres cfgs in own directories, renamed...
2012-10-24 Marco MarianiMerge remote-tracking branch 'origin/master' into lapp
2012-10-19 Marco MarianiMerge branch 'master' into lapp
2012-10-17 Marco MarianiMerge branch 'master' into lapp
2012-10-09 Viktor HorvathMerge remote-tracking branch 'slapos/lapp'
2012-10-04 Marco Marianimoved apache, postgres cfgs in own directories, renamed...