Commits · 2d85757c63f8228cc113e325a030c20d0c88b717 · Ophélie Gagnard / slapos

05 Mar, 2013 10 commits
- cleanup [versions] with more explanation. · 2d85757c
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  2d85757c
- Merge branch 'erp5' into erp5-z2.13 · 9458fb4c
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  9458fb4c
- Merge branch 'erp5-component' into erp5 · 6382f6e8
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  6382f6e8
- remove slapos.zcbworkarounds from [versions] · c4b2178a
  Kazuhiko Shiozaki authored Mar 05, 2013
```
because slapos.zcbworkarounds is a part of buildout extensions.
```
  c4b2178a
- Merge branch 'master' into erp5-component · 617f6abd
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  617f6abd
- update egg versions. · 0c37c5fe
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  0c37c5fe
- more detailed explanation in pinned versions. · 5aceb2d4
  Kazuhiko Shiozaki authored Mar 05, 2013
  
  5aceb2d4
- 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 21 commits
- Merge branch 'master' into erp5-component · f9f1c61d
  Kazuhiko Shiozaki authored Mar 04, 2013
  
  f9f1c61d
- Merge branch 'erp5' · 0f8e52e7
  Kazuhiko Shiozaki authored Mar 04, 2013
  
  0f8e52e7
- update md5sum of instance-cloudoo.cfg.in · f76f2385
  Gabriel Monnerat authored Mar 04, 2013
  
  f76f2385
- update md5sum · 40548dde
  Gabriel Monnerat authored Mar 04, 2013
  
  40548dde
- Merge branch 'erp5' into erp5-z2.13 · 92bfb5ca
  Kazuhiko Shiozaki authored Mar 04, 2013
```
Conflicts:
	stack/erp5/buildout.cfg
```
  92bfb5ca
- 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 3 commits
- Merge branch 'erp5' into erp5-z2.13 · c632afdd
  Kazuhiko Shiozaki authored Mar 02, 2013
  
  c632afdd
- 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 3 commits
- pin zope.app.appsetup = 3.16.0 because the newer version requires zope.traversing>=4.0.0a2. · 40a2387c
  Kazuhiko Shiozaki authored Mar 01, 2013
  
  40a2387c
- pin zope.app.publication = 3.14.0 because the newer version requires zope.i18n>=4.0.0a3 · a588f81d
  Kazuhiko Shiozaki authored Mar 01, 2013
  
  a588f81d
- forgot to specify groonga-normalizer-mysql's pkgconfig location · 3ea1c3d8
  Kazuhiko Shiozaki authored Mar 01, 2013
  
  3ea1c3d8
28 Feb, 2013 3 commits
- Fix JSON syntax · 363d3d56
  Cédric de Saint Martin authored Dec 06, 2012
  
  363d3d56
- Merge remote-tracking branch 'origin/erp5' into erp5-z2.13 · 1cec0090
  Kazuhiko Shiozaki authored Feb 28, 2013
  
  1cec0090
- 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