merge conflict : freeze versions
[slapos.git] / component / slapos / buildout.cfg
2011-07-15 Cédric de Saint... merge conflict : freeze versions slapos-0.28
2011-07-15 Cédric de Saint... slapos : Freeze versions
2011-07-15 Cédric de Saint... slapos : freeze versions slapos-0.27
2011-07-15 Cédric de Saint... Development: Unpin all except buildout.
2011-07-15 Cédric de Saint... Development: Unpin all except buildout.
2011-07-15 Cédric de Saint... slapos : freeze versions slapos-0.26
2011-07-15 Cédric de Saint... Merge branch 'kvm' slapos-0.25
2011-07-15 Cédric de Saint... Merge branch 'kvm' slapos-0.24
2011-07-15 Cédric de Saint... Development: Unpin all except buildout.
2011-07-15 Cédric de Saint... Merge branch 'slapos' slapos-0.23
2011-07-15 Cédric de Saint... Stabilize versions
2011-07-15 Rafael MonneratMerge branch 'erp5'
2011-07-13 Vivien AlgerMerge branch 'master' into kvm
2011-07-13 Łukasz NowakInstall only from quite reliable sources. slapos-0.20
2011-07-11 Cédric de Saint... Merge branch 'master' into osoetraining
2011-07-11 Łukasz NowakDevelopment: Unpin all except buildout.
2011-07-11 Łukasz NowakStabilise versions. slapos-0.15
2011-07-11 Łukasz NowakEnable networkcache usage.
2011-07-11 Łukasz NowakMerge branch 'master' into slapos
2011-07-08 Cédric de Saint... Merge branch 'master' into osoetraining
2011-07-07 Łukasz NowakMerge branch 'master' into erp5
2011-07-06 Łukasz NowakGo back to development.
2011-07-06 Łukasz NowakSeparate from system python. slapos-0.14
2011-07-06 Łukasz NowakStabilise versions.
2011-07-06 Łukasz NowakSelect the newest available slapos buildout.
2011-07-06 Łukasz NowakMerge branch 'master' into slapos
2011-07-01 Cédric de Saint... Merge branch 'master' into kvm
2011-06-30 Cédric de Saint... Merge branch 'slaprunner'
2011-06-30 Cédric de Saint... Merge branch 'phpmyadmin'
2011-06-30 Cédric de Saint... Merge branch 'phpmyadmin'
2011-06-29 Łukasz NowakMerge branch 'master' into erp5
2011-06-27 Cédric de Saint... Merge branch 'master' into slaprunner
2011-06-27 Łukasz NowakReset versions.
2011-06-27 Łukasz NowakPin versions. slapos-0.10
2011-06-27 Łukasz NowakUnfreeze versions.
2011-06-27 Łukasz NowakPrepare to merge into master. slapos-0.9
2011-06-27 Łukasz NowakSimplify default configuration.
2011-06-27 Cédric de Saint... Merge branch 'master' into phpmyadmin
2011-06-27 Łukasz NowakGo back to development.
2011-06-27 Łukasz NowakMerge branch 'master' into slapos
2011-06-27 Łukasz NowakPrepare merge with master.
2011-06-27 Łukasz NowakMerge branch 'master' into slapos
2011-06-24 Łukasz NowakGenerate buildout_networkache.
2011-06-24 Łukasz NowakPick updated SlapOS buildout.
2011-06-24 Łukasz NowakMerge branch 'master' into slapos
2011-06-13 Łukasz NowakMerge branch 'master' into erp5
2011-06-13 Rafael MonneratMerge branch 'erp5' into vifib
2011-06-13 Łukasz NowakMerge branch 'master' into vifib
2011-06-03 Sebastien RobinMerge branch 'master' into erp5testnode
2011-06-01 Łukasz NowakGo back to development.
2011-06-01 Łukasz NowakMerge branch 'slapos' slapos-0.3
2011-06-01 Łukasz NowakStabilise for release.
2011-06-01 Łukasz NowakSeparate python from host system.
2011-06-01 Łukasz NowakSeparate python from host system.
2011-05-31 Łukasz NowakBack to development.
2011-05-31 Łukasz NowakStabilise distributions versions. slapos-0.2
2011-05-31 Łukasz NowakProvide slapos component.