Commits · 8be711fdc4d1fdb6929e1c9151fb62bd3946b358 · Lisa Casino / slapos

24 Jan, 2012 9 commits

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 2 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
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

Remove python-2.7 compilation from lamp-based profiles · 93377e92
Cédric de Saint Martin authored Jan 20, 2012
```
compilation of python is not needed here, we relie on python provided with slapos.
```
93377e92

Add back python-2.7 in lamp stack. · 1aabdb3c

Cédric de Saint Martin authored Jan 20, 2012

It is dummy import for up-to-date software.cfg, but allows to keep retrocompatibility with old software.cfg using python-2.7 in eggs.
python-2.7 should NOT be used in lamp-based profiles.

1aabdb3c

19 Jan, 2012 1 commit
- lamp stack : Remove python2.7 · 875ff376
  Cédric de Saint Martin authored Jan 19, 2012
  
  875ff376
18 Jan, 2012 16 commits
- mysql : pin eggs versions · 157dcecc
  Cédric de Saint Martin authored Jan 18, 2012
  
  157dcecc
- Mysql : add cedric's shacache certificate · ee1bd99e
  Cédric de Saint Martin authored Jan 18, 2012
  
  ee1bd99e
- Add buildout-versions · dce17a52
  Cédric de Saint Martin authored Jan 18, 2012
  
  dce17a52
- Update allow-host list · 4dfe85ec
  Cédric de Saint Martin authored Jan 18, 2012
  
  4dfe85ec
- Mysql : sort extends list · d27a1be0
  Cédric de Saint Martin authored Jan 18, 2012
  
  d27a1be0
- mysql : rewrite parts list · f5dff2e2
  Cédric de Saint Martin authored Jan 18, 2012
  
  f5dff2e2
- Go back to development · dc380188
  Cédric de Saint Martin authored Jan 18, 2012
  
  dc380188
- kumo : Fix versions · 1a73975b
  Cédric de Saint Martin authored Jan 18, 2012
  
  1a73975b
- Update stunnel to 4.52 · 8f5b9e53
  Cédric de Saint Martin authored Jan 18, 2012
  
  8f5b9e53
- Add buildout-versions · 6163aa92
  Cédric de Saint Martin authored Jan 18, 2012
  
  6163aa92
- Change part order to avoid hexagonit.* bug · 399bc69d
  Cédric de Saint Martin authored Jan 18, 2012
  
  399bc69d
- kumo : Set complete part list · 9e84a344
  Cédric de Saint Martin authored Jan 18, 2012
  
  9e84a344
- kumofs : git and python are not needed · d0a7caf6
  Cédric de Saint Martin authored Jan 18, 2012
  
  d0a7caf6
- Update allow-host list · 166ce209
  Cédric de Saint Martin authored Jan 18, 2012
  
  166ce209
- Go back to development mode · a0d43108
  Cédric de Saint Martin authored Jan 18, 2012
  
  a0d43108
- Add Cedric's shacahe signature · 4aec863f
  Cédric de Saint Martin authored Jan 18, 2012
  
  4aec863f
13 Jan, 2012 6 commits
- make build options more similar to official MariaDB build, i.e. enable XtraDB by default etc. · b05e9916
  Kazuhiko Shiozaki authored Nov 09, 2011
```
Conflicts:

	component/mariadb/buildout.cfg
```
  b05e9916
- Merge branch 'master' into lamp · badb698f
  Cédric de Saint Martin authored Jan 13, 2012
```
Conflicts:
	component/mariadb/buildout.cfg
```
  badb698f
- add readline-5 that is still used for GPL2 only softwares. · 5eb8b8eb
  Kazuhiko Shiozaki authored Dec 22, 2011
```
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
```
  5eb8b8eb
- version up : MariaDB 5.3.3. use readline5 (GPL2) instead of the latest readline (GPL3). · ae0e13bb
  Kazuhiko Shiozaki authored Dec 22, 2011
```
Conflicts:

	component/mariadb/buildout.cfg
```
  ae0e13bb
- version up : MariaDB 5.3.2-beta · 4a3cfc1a
  Kazuhiko Shiozaki authored Oct 20, 2011
```
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
```
  4a3cfc1a
- version up : pcre 8.21. · 725acce0
  Kazuhiko Shiozaki authored Jan 12, 2012
```
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
```
  725acce0