Commits · 2df783fa823e24ff7767c654c610a5086f8b6f4e · Steven Gueguen / slapos

15 Aug, 2012 4 commits
- 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 21 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
- Cleanup kvm+ profile · efe78ed6
  Cédric de Saint Martin authored Aug 13, 2012
  
  efe78ed6
- Allow extends from instance profile to another one · 7d067e04
  Cédric de Saint Martin authored Aug 13, 2012
  
  7d067e04
- Upgrade kvm to 1.1.1 · dfa6e4c5
  Cédric de Saint Martin authored Aug 13, 2012
  
  dfa6e4c5
- Update novnc · 33f73c37
  Cédric de Saint Martin authored Aug 13, 2012
  
  33f73c37
- Use requestoptional for frontend · 02778df8
  Cédric de Saint Martin authored Aug 13, 2012
  
  02778df8
- Merge branch 'master' into kvm · 061a7d05
  Cédric de Saint Martin authored Aug 13, 2012
  
  061a7d05
- Pin versions · d1f1d6a9
  Cédric de Saint Martin authored Aug 13, 2012
  
  d1f1d6a9
- Update egg versions in slaprunner · 76166922
  Cédric de Saint Martin authored Aug 13, 2012
  
  76166922
- Advertise development of new version · 8f8ac6b3
  Cédric de Saint Martin authored Aug 13, 2012
  
  8f8ac6b3
- Release slapos.cookbook-0.60 · 7dffde36
  Cédric de Saint Martin authored Aug 13, 2012
  
  7dffde36
- Merge branch 'slaprunner' · c52f1520
  Cédric de Saint Martin authored Aug 13, 2012
  
  c52f1520
- Use requestoptional in slaprunner · 6d29cac1
  Cédric de Saint Martin authored Aug 13, 2012
  
  6d29cac1
- Update drupal · 436934d2
  Cédric de Saint Martin authored Aug 13, 2012
  
  436934d2
- Change default mysql port · 1d8f9a71
  Cédric de Saint Martin authored Aug 13, 2012
```
Reason: won't collide with mysql instance in slaprunner
```
  1d8f9a71
- Use requestoptional in lamp · 6e6578ca
  Cédric de Saint Martin authored Aug 13, 2012
  
  6e6578ca
- unpin versions · 4c5a39cf
  Cédric de Saint Martin authored Aug 13, 2012
  
  4c5a39cf
- Add recipe requesting instance without failing if not ready · adcb9f63
  Cédric de Saint Martin authored Aug 13, 2012
  
  adcb9f63
- Add check for empty URL in promise · 52bdd411
  Cédric de Saint Martin authored Aug 13, 2012
  
  52bdd411
- update apache version to 2.4.2 · f33ad971
  Mayoro Diagne authored Aug 11, 2012
```
(cherry picked from commit 18f76b5b)
```
  f33ad971
10 Aug, 2012 4 commits
- Update template to follow code change · 64efe1b4
  Cédric de Saint Martin authored Aug 10, 2012
  
  64efe1b4
- Fix md5sum for cloudooo/instance*.cfg.in files · a7a7ff7d
  Rafael Monnerat authored Aug 10, 2012
  
  a7a7ff7d
- Update erp5.util version. · 7d72e872
  Rafael Monnerat authored Aug 10, 2012
  
  7d72e872
- Update variable name · 6015e53b
  Cédric de Saint Martin authored Aug 10, 2012
  
  6015e53b
09 Aug, 2012 3 commits
- Update egg versions · 1e62c6ab
  Cédric de Saint Martin authored Aug 09, 2012
  
  1e62c6ab
- Update autoconf/automake · f0b93939
  Lahoucine BENLAHMR authored Jul 25, 2012
```
automake 2.12 will be used by default.
(cherry picked from commit c2ac17fec2df8d176caffc26cccf5a26318fe7a8)
```
  f0b93939
- update cloud9 · 558b74e8
  Cédric de Saint Martin authored Aug 09, 2012
  
  558b74e8
08 Aug, 2012 4 commits
- Fix branch name to erp5 instead of erp5-component · f1664705
  Rafael Monnerat authored Aug 08, 2012
  
  f1664705
- Merge branch 'erp5-component' into erp5 · 1dd3404d
  Rafael Monnerat authored Aug 08, 2012
```
Conflicts:
	software/erp5/software.cfg
	stack/cloudooo.cfg
	stack/erp5/buildout.cfg
```
  1dd3404d
- Remove unused find-link · f5b9bbc7
  Cédric de Saint Martin authored Aug 07, 2012
  
  f5b9bbc7
- Update versions · b8b4ea53
  Cédric de Saint Martin authored Aug 07, 2012
  
  b8b4ea53
07 Aug, 2012 1 commit
- version up : Expat 2.1.0, including security fixes. · 7b840d30
  Kazuhiko Shiozaki authored Aug 07, 2012
  
  7b840d30