Commits · slapos-0.101 · nexedi / slapos

20 Aug, 2012 2 commits
- New slapos.core release into master · 101a7b23
  Cédric Le Ninivin authored Aug 20, 2012
```
Merge branch 'slapos'

Conflicts:
	component/slapos/buildout.cfg
```
  101a7b23
- Merge remote-tracking branch 'origin/master' · 794a51c7
  Cédric Le Ninivin authored Aug 20, 2012
  
  794a51c7
18 Aug, 2012 1 commit
- Pin versions · 59e68685
  Cédric de Saint Martin authored Aug 18, 2012
  
  59e68685
17 Aug, 2012 26 commits
- Merge branch 'master' into slaprunner · af6bb650
  Cédric de Saint Martin authored Aug 17, 2012
  
  af6bb650
- Upgrade versions for slapos 0.28.2 · 13681cb9
  Cédric Le Ninivin authored Aug 17, 2012
  
  13681cb9
- Remove changes not related to slapos.cookbook · 39e79046
  Cédric de Saint Martin authored Aug 17, 2012
  
  39e79046
- Advertise development of new version · befd9013
  Alain Takoudjou authored Aug 17, 2012
  
  befd9013
- Release slapos.cookbook-0.61 · 070d7378
  Alain Takoudjou authored Aug 17, 2012
  
  070d7378
- Update cloud9 part into instance-runner · 8a46f84f
  Alain Takoudjou authored Aug 17, 2012
  
  8a46f84f
- Update instance-runner md5sum · ceb5c307
  Alain Takoudjou authored Aug 17, 2012
  
  ceb5c307
- Update cloud9 part into instance-runner · 1064f7d2
  Alain Takoudjou authored Aug 17, 2012
  
  1064f7d2
- upgrade md5 and port · 077cad09
  Jean-Baptiste Petre authored Aug 17, 2012
  
  077cad09
- slaprunner add promise · 23be32f2
  Jean-Baptiste Petre authored Aug 17, 2012
  
  23be32f2
- Add instance-runner.cfg md5sum · 033c110c
  Alain Takoudjou authored Aug 17, 2012
  
  033c110c
- Go back to an cloud9 stable version · 4c5745b0
  Alain Takoudjou authored Aug 17, 2012
  
  4c5745b0
- Add Cloud9 stable version · 091bf137
  Alain Takoudjou authored Aug 17, 2012
  
  091bf137
- Updated versions list · b972da0d
  Cédric Le Ninivin authored Aug 17, 2012
  
  b972da0d
- Merge remote branch 'origin/master' into slapos · 954c9aa8
  root authored Aug 17, 2012
  
  954c9aa8
- Merge remote branch 'origin/introduce_slapos' into slapos · 94bd7a7b
  root authored Aug 17, 2012
  
  94bd7a7b
- Update cloud9 part into instance-runner · 2eccc70a
  Alain Takoudjou authored Aug 17, 2012
  
  2eccc70a
- Update instance-runner md5sum · 8969502a
  Alain Takoudjou authored Aug 17, 2012
  
  8969502a
- Update cloud9 part into instance-runner · a1744df1
  Alain Takoudjou authored Aug 17, 2012
  
  a1744df1
- upgrade md5 and port · 4eae4b26
  Jean-Baptiste Petre authored Aug 17, 2012
  
  4eae4b26
- Introducing bin/slapos · f647dad9
  Cédric Le Ninivin authored Aug 17, 2012
  
  f647dad9
- Introducing bin/slapos · dc0dffd5
  Cédric Le Ninivin authored Aug 17, 2012
  
  dc0dffd5
- slaprunner add promise · 87500b50
  Jean-Baptiste Petre authored Aug 17, 2012
  
  87500b50
- Add instance-runner.cfg md5sum · 9a1d1d1b
  Alain Takoudjou authored Aug 17, 2012
  
  9a1d1d1b
- Go back to an cloud9 stable version · ca5f9169
  Alain Takoudjou authored Aug 17, 2012
  
  ca5f9169
- Add Cloud9 stable version · 6a7f6a30
  Alain Takoudjou authored Aug 17, 2012
  
  6a7f6a30
16 Aug, 2012 1 commit
- Pin new version of hexagonit.recipe.download · 376f1f11
  Cédric de Saint Martin authored Aug 16, 2012
```
Won't fill /tmp anymore.
```
  376f1f11
15 Aug, 2012 5 commits
- Fix merge from erp5 to master: lxml egg · 9b1ca751
  Cédric de Saint Martin authored Aug 15, 2012
  
  9b1ca751
- Fill changelog · 2df783fa
  Cédric de Saint Martin authored Aug 15, 2012
  
  2df783fa
- Merge branch 'slaprunner' · dfe62195
  Cédric de Saint Martin authored Aug 15, 2012
  
  dfe62195
- Merge branch 'erp5' · 320a228b
  Cédric de Saint Martin authored Aug 15, 2012
```
Conflicts:
	component/automake/buildout.cfg
	component/ca-certificates/buildout.cfg
	component/openssl/buildout.cfg
	software/lamp-template/instance.cfg
	stack/slapos.cfg
```
  320a228b
- Update slapos.toolbox · 05855cef
  Cédric de Saint Martin authored Aug 15, 2012
  
  05855cef
14 Aug, 2012 3 commits
- Allow to set debug mode in slaprunner-instance profile · 9773acfa
  Alain Takoudjou authored Aug 14, 2012
  
  9773acfa
- Update node.js to v0.6.21 · 83e552f0
  Cédric de Saint Martin authored Aug 14, 2012
  
  83e552f0
- Use python provded by slapos · 8a152fdb
  Cédric de Saint Martin authored Aug 14, 2012
  
  8a152fdb
13 Aug, 2012 2 commits
- For KVM · a42e4f93
  Rafael Monnerat authored Aug 13, 2012
```
(cherry picked from commit 5c54eee5adeb556b8145d6943054c02e9323cefe)
```
  a42e4f93
- Update versions · 1e3eed50
  Cédric de Saint Martin authored Aug 13, 2012
  
  1e3eed50