Commits · 5cc00f0048aaf36684f1cde8d4a9e21ccba6729d · Eteri / slapos

05 Mar, 2013 9 commits
- Fix 0f8e52e7 merge. · 5cc00f00
  Cédric de Saint Martin authored Mar 05, 2013
  
  5cc00f00
- Define empty return_parameter_dict in case of request error. · 7ec7fad7
  Cédric de Saint Martin authored Mar 05, 2013
  
  7ec7fad7
- Pin missing egg version in lamp stack · e9003f00
  Cédric de Saint Martin authored Mar 05, 2013
  
  e9003f00
- Disable non-working slapmonitor on LAMP stack. · 3749950f
  Cédric de Saint Martin authored Mar 05, 2013
```
Was only used for specific demo.
```
  3749950f
- Force PEAR to create conf file in apache directory. · 66901b81
  Cédric de Saint Martin authored Mar 05, 2013
  
  66901b81
- Update PHP to 5.4.12. · c3a948e3
  Cédric de Saint Martin authored Mar 05, 2013
  
  c3a948e3
- update md5sum of the instance.cfg used by erp5-util-testing · b3ab8a06
  Sebastien Robin authored Mar 05, 2013
  
  b3ab8a06
- avoid using the libxml2 from the system library · ea216aa1
  Sebastien Robin authored Mar 05, 2013
  
  ea216aa1
- use our patched hexagonit.recipe.download = 1.6nxd002 to support .xz archive. · 70e9903a
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  70e9903a
04 Mar, 2013 17 commits
- Merge branch 'erp5' · 0f8e52e7
  Kazuhiko Shiozaki authored Mar 04, 2013
  
  0f8e52e7
- Merge branch 'erp5-component' into erp5 · 591782d6
  Kazuhiko Shiozaki authored Mar 04, 2013
  
  591782d6
- Update pinned egg versions in postgresql SR. · 0408949b
  Cédric de Saint Martin authored Mar 04, 2013
  
  0408949b
- Add shacache certificates for postgresql SR. · 0c622bbe
  Cédric de Saint Martin authored Mar 04, 2013
```
Required for production.
```
  0c622bbe
- update md5sum of instance-cloudoo.cfg.in · 78ef71c5
  Gabriel Monnerat authored Mar 04, 2013
  
  78ef71c5
- Update pinned egg versions · 854c2ed1
  Cédric de Saint Martin authored Mar 04, 2013
  
  854c2ed1
- update md5sum · ee4c05a6
  Gabriel Monnerat authored Mar 04, 2013
  
  ee4c05a6
- Update readme.txt · 4299544c
  Cédric de Saint Martin authored Mar 04, 2013
  
  4299544c
- Update gnutls location. · 754564b7
  Cédric de Saint Martin authored Mar 04, 2013
  
  754564b7
- Use upstreamed websockify · bd720a49
  Cédric de Saint Martin authored Mar 01, 2013
  
  bd720a49
- Update novnc. · d63fbe5d
  Cédric de Saint Martin authored Mar 01, 2013
  
  d63fbe5d
- nbd onetimeupload is watched. · 2b06b7d0
  Cédric de Saint Martin authored Feb 28, 2013
  
  2b06b7d0
- Update KVM to 1.2.0 · a9795878
  Cédric de Saint Martin authored Feb 28, 2013
  
  a9795878
- Move to new development workflow. · 51e53c7f
  Cédric de Saint Martin authored Feb 28, 2013
  
  51e53c7f
- Move out kvm into its own component · 6945d72d
  Cédric de Saint Martin authored Feb 28, 2013
  
  6945d72d
- Don't publish parameters twice in KVM · 8649b51c
  Cédric de Saint Martin authored Mar 04, 2013
  
  8649b51c
- Merge remote-tracking branch 'origin/master' into erp5-component · 6cfce3b6
  Kazuhiko Shiozaki authored Mar 04, 2013
```
Move all non-generic changes in software/perl/buildoug.cfg to software/mioga/software.cfg.

Conflicts:
	component/apache/buildout.cfg
	component/imagemagick/buildout.cfg
	component/perl/buildout.cfg
	slapos/recipe/request.py
	stack/erp5/buildout.cfg
```
  6cfce3b6
02 Mar, 2013 2 commits
- Revert "in erp5-component branch, use erp5-component branches for erp5 and slapos repositories." · 1ab8b249
  Kazuhiko Shiozaki authored Mar 02, 2013
```
This reverts commit 061a05cd.
```
  1ab8b249
- Merge branch 'erp5-component' into erp5 · 2f524508
  Kazuhiko Shiozaki authored Mar 02, 2013
  
  2f524508
01 Mar, 2013 1 commit
- forgot to specify groonga-normalizer-mysql's pkgconfig location · 3ea1c3d8
  Kazuhiko Shiozaki authored Mar 01, 2013
  
  3ea1c3d8
28 Feb, 2013 8 commits
- Fix JSON syntax · 363d3d56
  Cédric de Saint Martin authored Dec 06, 2012
  
  363d3d56
- update groonga-3.0.1, groonga-normalizer-mysql-1.0.1 and mroonga-3.01. · 2eb2a758
  Kazuhiko Shiozaki authored Feb 28, 2013
```
now utf8_unicode_ci is supported !!!
```
  2eb2a758
- in erp5-component branch, use erp5-component branches for erp5 and slapos repositories. · 061a05cd
  Kazuhiko Shiozaki authored Feb 28, 2013
```
This reverts commit 4dba26ff.
```
  061a05cd
- Merge remote-tracking branch 'origin/erp5' into erp5-component · 469cd87e
  Kazuhiko Shiozaki authored Feb 28, 2013
  
  469cd87e
- update md5sum of instance-zope.cfg.in · 4d12f08f
  Sebastien Robin authored Feb 26, 2013
  
  4d12f08f
- use pyPdf instead of PyPDF2 until PyPDF2 can be installed · fee52ae9
  Sebastien Robin authored Feb 25, 2013
  
  fee52ae9
- remove some remaining references to pdftk · 707987ca
  Sebastien Robin authored Feb 22, 2013
  
  707987ca
- pdftk removed from erp5 · 71ed0078
  Sebastien Robin authored Feb 21, 2013
  
  71ed0078
27 Feb, 2013 3 commits
- Pin spyne to 2.9.3 · 408f595b
  Jérome Perrin authored Feb 27, 2013
```
This should have been part of 55f915c3
```
  408f595b
- version up : lxml 2.3.6. · c3515891
  Kazuhiko Shiozaki authored Feb 27, 2013
  
  c3515891
- version up : Apache httpd 2.4.4, Apache httpd 2.2.24 and apr-util 1.5.1. · 118c168b
  Kazuhiko Shiozaki authored Feb 27, 2013
  
  118c168b