Merge branch 'master' into erp5-cluster
[slapos.git] / software / neoppod / cluster.cfg.in
2014-11-19 Julien MuchembledMerge branch 'master' into erp5-cluster
2014-11-19 Julien Muchembledrequest: drop redundant 'config' & 'sla' options slapos.cookbook-0.91
2014-11-18 Julien MuchembledNew recipe 'switch-softwaretype' deprecating 'softwaretype'
2014-08-20 Cédric de Saint... Merge remote-tracking branch 'origin/accords'
2014-08-20 Cédric de Saint... Merge remote-tracking branch 'origin/gitweb'
2014-08-20 Cédric de Saint... Merge remote-tracking branch 'origin/zabbix'
2014-02-11 Kazuhiko ShiozakiMerge remote-tracking branch 'origin/master' into erp5t...
2013-08-22 Cédric de Saint... Merge branch 'kvm'
2013-08-12 Cédric de Saint... Merge branch 'kvm'
2013-08-08 Cédric de Saint... Merge branch 'kvm'
2013-08-08 Cédric de Saint... Merge branch 'kvm'
2013-08-07 Julien MuchembledMerge remote-tracking branch 'origin/master' into erp5...
2013-08-02 Cédric de Saint... Merge branch 'kvm'
2013-07-18 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-07-16 Cédric Le Ninivinslaprunner: Merge branch 'slaprunner' with master slaprunner-resilient-v1-RC1
2013-07-16 Cédric Le NinivinMerge branch 'slaprunner-resiliency'
2013-07-11 Kazuhiko ShiozakiMerge branch 'erp5' into erp5-z2.13
2013-07-11 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-07-11 Kazuhiko ShiozakiMerge branch 'master' into erp5-component
2013-07-09 Vincent Pelletierneoppod: Drop "verbose" parameter, as it's not supporte...
2013-05-17 Alain TakoudjouMerge master into grid-computing
2013-03-29 Cédric de Saint... Merge branch 'slaprunner'
2013-03-05 Cédric de Saint... Merge branch 'agent'
2013-03-04 Kazuhiko ShiozakiMerge branch 'erp5'
2013-03-04 Kazuhiko ShiozakiMerge remote-tracking branch 'origin/master' into erp5...
2013-02-14 Kazuhiko ShiozakiMerge remote-tracking branch 'origin/erp5' into erp5...
2013-02-05 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-01-18 Cédric de Saint... Merge branch 'master' into erp5-component-merge
2013-01-11 Cédric de Saint... Merge branch 'master' into erp5-component
2012-12-13 Kazuhiko ShiozakiMerge remote-tracking branch 'origin/erp5' into erp5...
2012-10-10 Vincent PelletierInitial neoppod commit.