Commits · 18e13b9c112627199b9a4aa0eeb80c28d3e1ec0a · Ayush Tiwari / slapos

15 Jan, 2014 1 commit

Merge branch 'erp5' into erp5-cluster · 18e13b9c

Kazuhiko Shiozaki authored Jan 15, 2014

Conflicts:
	stack/erp5/buildout.cfg
	stack/erp5/instance-erp5-cluster.cfg.in
	stack/erp5/instance-erp5-single.cfg.in
	stack/erp5/instance-kumofs.cfg.in
	stack/erp5/instance-zope.cfg.in
	stack/erp5/instance.cfg.in

18e13b9c

14 Jan, 2014 1 commit
- version up : LibreOffice 3.6.7.2. · ae5af000
  Kazuhiko Shiozaki authored Nov 14, 2013
```
Conflicts:
	component/libreoffice-bin/buildout.cfg
```
  ae5af000
10 Jan, 2014 14 commits
- Merge branch 'erp5-component' into erp5 · a66d0ff3
  Kazuhiko Shiozaki authored Jan 10, 2014
  
  a66d0ff3
- slaprunner: updated eggs · f75d3dbf
  Nicolas Wavrant authored Jan 09, 2014
  
  f75d3dbf
- slaprunner: cloud9 removed from Software Release · 2aade777
  Nicolas Wavrant authored Jan 08, 2014
  
  2aade777
- [jio-egg-testing] Fix setuptools version up · f5672c91
  Rafael Monnerat authored Jan 09, 2014
  
  f5672c91
- [jio-egg-testing] Fix to follow up change of setuptools version · 401bef61
  Rafael Monnerat authored Jan 09, 2014
  
  401bef61
- specify slapos.core version in instance-erp5-*.cfg.in and instance-zope.cfg.in. · 170bed22
  Kazuhiko Shiozaki authored Jan 08, 2014
```
otherwise buggy slapos.core-1.0 will be used if exists.
```
  170bed22
- version up : gettext 0.18.3.2. · c0f0cbeb
  Kazuhiko Shiozaki authored Jan 08, 2014
  
  c0f0cbeb
- version up : grep 2.16. · 6d0e843c
  Kazuhiko Shiozaki authored Jan 08, 2014
  
  6d0e843c
- revert to use slapos.core = 0.35.1. · eb369a11
  Kazuhiko Shiozaki authored Jan 08, 2014
```
running cp using slapos.core 1.0.0 in sr does not work.
```
  eb369a11
- version up : setuptools 2.1. · d2a26b12
  Kazuhiko Shiozaki authored Jan 07, 2014
  
  d2a26b12
- version up : OpenSSL 1.0.1f, including bug and security fixes. · 597a400f
  Kazuhiko Shiozaki authored Jan 07, 2014
  
  597a400f
- update eggs. · fecbe605
  Kazuhiko Shiozaki authored Jan 06, 2014
  
  fecbe605
- update eggs. · cb28f98d
  Kazuhiko Shiozaki authored Jan 05, 2014
  
  cb28f98d
- cleanup egg versions. · b0e6a821
  Kazuhiko Shiozaki authored Jan 05, 2014
  
  b0e6a821
08 Jan, 2014 2 commits
- [slapos-testing] Set versions for eggs · 16175f11
  Rafael Monnerat authored Jan 08, 2014
  
  16175f11
- [slapos-testing] Fix and upgrade setup of setuptools for testing · f6d1b0a5
  Rafael Monnerat authored Jan 08, 2014
  
  f6d1b0a5
07 Jan, 2014 1 commit
- Update release (Merge branch 'slapos') · 634f54dd
  Rafael Monnerat authored Jan 07, 2014
  
  634f54dd
04 Jan, 2014 1 commit
- Merge branch 'erp5-component' into erp5 · 37427ee7
  Kazuhiko Shiozaki authored Jan 04, 2014
  
  37427ee7
03 Jan, 2014 4 commits
- Downgrade setuptools for opensuse package compatibility · d842dbc2
  Rafael Monnerat authored Jan 03, 2014
  
  d842dbc2
- Merge remote-tracking branch 'origin/master' into erp5-component · 8c0cac2d
  Kazuhiko Shiozaki authored Jan 03, 2014
  
  8c0cac2d
- version up : MySQL-python 1.2.5. · ba4d2d6f
  Kazuhiko Shiozaki authored Jan 03, 2014
  
  ba4d2d6f
- Install pprofile, a pure-python line profiler. · c621cc93
  Vincent Pelletier authored Dec 18, 2013
  
  c621cc93
02 Jan, 2014 2 commits
- Update version to use slapos.core 1.0.0 · e1f23727
  Rafael Monnerat authored Jan 02, 2014
  
  e1f23727
- Merge remote-tracking branch 'origin/master' into slapos · 754d77ee
  Rafael Monnerat authored Jan 02, 2014
  
  754d77ee
29 Dec, 2013 3 commits
- Merge branch 'erp5-component' into erp5 · 01a467f4
  Kazuhiko Shiozaki authored Dec 30, 2013
  
  01a467f4
- version up : apr 1.5.0, apr-util 1.5.3 and apache httpd 2.4.7. · c2db37db
  Kazuhiko Shiozaki authored Dec 29, 2013
  
  c2db37db
- version up : groonga 3.1.1 and mroonga-3.11. · c62b8257
  Kazuhiko Shiozaki authored Dec 29, 2013
  
  c62b8257
27 Dec, 2013 3 commits
- version up : MariaDB 10.0.7. · 58fe8d17
  Kazuhiko Shiozaki authored Dec 27, 2013
  
  58fe8d17
- version up : Percona Toolkit 2.2.6. · 4131dd54
  Kazuhiko Shiozaki authored Dec 27, 2013
  
  4131dd54
- pin older version of huBarcode for now. · cf31ef9b
  Kazuhiko Shiozaki authored Dec 27, 2013
```
because huBarcode 1.0.0 has an issue in importing PIL.
```
  cf31ef9b
19 Dec, 2013 6 commits
- Merge remote-tracking branch 'origin/master' into erp5-component · 2ce702dc
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  2ce702dc
- version up : curl 7.34.0. · c40b3ea7
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  c40b3ea7
- forgot to update slapos.recipe.build. · bd40ba6a
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  bd40ba6a
- update eggs. · 27c27df7
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  27c27df7
- update CMF. · 82ab9b22
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  82ab9b22
- remove needless part for python-2.7. · 95509816
  Kazuhiko Shiozaki authored Dec 19, 2013
  
  95509816
18 Dec, 2013 2 commits
- Install pprofile, a pure-python line profiler. · 78c72ec3
  Vincent Pelletier authored Dec 18, 2013
```
(cherry picked from commit 60f4e22d)

Conflicts:
	stack/erp5/buildout.cfg
```
  78c72ec3
- Install pprofile, a pure-python line profiler. · 60f4e22d
  Vincent Pelletier authored Dec 18, 2013
  
  60f4e22d