Commits · 6c1d891df4b28ee25194987083182cb9863093fa · Romain Courteaud / slapos

25 Jan, 2012 17 commits
- Merge remote-tracking branch 'origin/erp5' into deployment_generic_CR1094 · 6c1d891d
  Romain Courteaud authored Jan 25, 2012
```
Conflicts:
	component/mariadb/buildout.cfg
	software/erp5/software.cfg
```
  6c1d891d
- Upgrade to Zope 2.12.22 · 184c8530
  Romain Courteaud authored Jan 25, 2012
  
  184c8530
- Merge remote-tracking branch 'origin/master' into erp5 · b3cf1cbb
  Łukasz Nowak authored Jan 25, 2012
```
Conflicts:
	component/git/buildout.cfg
	component/openssl/buildout.cfg
	setup.py
```
  b3cf1cbb
- Extend develop instead of override. · 83782792
  Łukasz Nowak authored Jan 25, 2012
```
Currently ERP5 develops more.
```
  83782792
- Merge branch 'lamp' · a3d5ed82
  Cédric de Saint Martin authored Jan 25, 2012
  
  a3d5ed82
- Merge branch 'master' into lamp · 92c07b08
  Cédric de Saint Martin authored Jan 25, 2012
  
  92c07b08
- Fix versions · 3bf73b89
  Cédric de Saint Martin authored Jan 25, 2012
  
  3bf73b89
- Fix branch name. · 7db2f692
  Łukasz Nowak authored Jan 25, 2012
  
  7db2f692
- Merge remote-tracking branch 'origin/erp5-generic' into erp5 · 5fa370b5
  Łukasz Nowak authored Jan 25, 2012
```
Conflicts:
	slapos/recipe/erp5/__init__.py
```
  5fa370b5
- Merge remote-tracking branch 'origin/erp5testnode' · ba147517
  Łukasz Nowak authored Jan 25, 2012
  
  ba147517
- Freeze eggs. · 03d03c7a
  Łukasz Nowak authored Jan 25, 2012
  
  03d03c7a
- Merge remote-tracking branch 'origin/webdav' · 102da483
  Łukasz Nowak authored Jan 25, 2012
  
  102da483
- Remove shacache stack from lamp templates · 207ab912
  Cédric de Saint Martin authored Jan 25, 2012
  
  207ab912
- lamp stack : add buildout-versions · 0e9231bc
  Cédric de Saint Martin authored Jan 25, 2012
  
  0e9231bc
- LAMP template : update buildout version · 5fbf5c7d
  Cédric de Saint Martin authored Jan 25, 2012
  
  5fbf5c7d
- LAMP template : Set local path in extends · 912c6790
  Cédric de Saint Martin authored Jan 25, 2012
  
  912c6790
- version up : curl 7.24.0, including security fixes. · 503a5546
  Kazuhiko Shiozaki authored Jan 25, 2012
  
  503a5546
24 Jan, 2012 14 commits
- Slapos : Pin versions · 9af739e0
  Cédric de Saint Martin authored Jan 24, 2012
  
  9af739e0
- Merge branch 'master' into slapos · cfd63e78
  Cédric de Saint Martin authored Jan 24, 2012
```
Conflicts:
	component/slapos/buildout.cfg
```
  cfd63e78
- Add patch to openssl removing need of pod2man and thus perl · ea3ab73e
  Cédric de Saint Martin authored Jan 24, 2012
  
  ea3ab73e
- Merge remote-tracking branch 'origin/nosqltestbed' · f047f2d4
  Łukasz Nowak authored Jan 24, 2012
  
  f047f2d4
- Merge remote-tracking branch 'origin/nbd' · 62833e5a
  Łukasz Nowak authored Jan 24, 2012
  
  62833e5a
- Merge remote-tracking branch 'origin/erp5scalabilitytestbed' · 8be711fd
  Łukasz Nowak authored Jan 24, 2012
  
  8be711fd
- Merge remote-tracking branch 'origin/pulse' · b24fc0f4
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	component/apache-php/buildout.cfg

Master version of component/apache-php/buildout.cfg has been kept, as it
provides same functionality but in more updated way.
```
  b24fc0f4
- Merge remote-tracking branch 'origin/testnode' · 9d3d5182
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  9d3d5182
- Merge remote-tracking branch 'origin/sheepdogtestbed' · fd048f1d
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  fd048f1d
- Merge remote-tracking branch 'origin/proactive' · e86095ac
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  e86095ac
- Merge remote-tracking branch 'origin/libcloud-requester' · c7032ccd
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  c7032ccd
- Merge remote-tracking branch 'origin/libcloud' · 906a64af
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  906a64af
- Merge remote-tracking branch 'origin/java' · 8a602b4a
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  8a602b4a
- Merge remote-tracking branch 'origin/helloworld' · 9eedf794
  Łukasz Nowak authored Jan 24, 2012
```
Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.
```
  9eedf794
23 Jan, 2012 3 commits
- Merge branch 'master' into lamp · 077ed704
  Cédric de Saint Martin authored Jan 23, 2012
```
Conflicts:
	software/lamp-template-static/software.cfg
```
  077ed704
- Set local path in extends now that webrunner supports git access · 24c7e784
  Cédric de Saint Martin authored Jan 23, 2012
  
  24c7e784
- Add LongRequestLogger product support. · 6bf658d8
  Ivan Tyagov authored Jan 23, 2012
  
  6bf658d8
22 Jan, 2012 4 commits
- Pin versions · c2148d59
  Cédric de Saint Martin authored Jan 22, 2012
  
  c2148d59
- Use buildout-versions · 81c607df
  Cédric de Saint Martin authored Jan 22, 2012
  
  81c607df
- Use latest buildout · ae064c32
  Cédric de Saint Martin authored Jan 22, 2012
  
  ae064c32
- No need for python in lamp · f328fe0a
  Cédric de Saint Martin authored Jan 22, 2012
  
  f328fe0a
20 Jan, 2012 2 commits
- Workaround part interconnection problem. · 340f4ece
  Łukasz Nowak authored Jan 20, 2012
  
  340f4ece
- Workaround part interconnection problem. · 9aff9e6e
  Łukasz Nowak authored Jan 20, 2012
  
  9aff9e6e