Commits · 418ef85e1dc7773f3381eb73f64bec1f16ec8af8 · Lisa Casino / slapos

14 Jun, 2011 25 commits
- Merge branch 'kumofs' · 418ef85e
  Cédric de Saint Martin authored Jun 14, 2011
  
  418ef85e
- Merge branch 'memcached' · eac620c4
  Cédric de Saint Martin authored Jun 14, 2011
  
  eac620c4
- Allow to upgrade setuptools during process. · 8c28e62c
  Łukasz Nowak authored Jun 14, 2011
  
  8c28e62c
- Merge branch 'erp5' · 2764645d
  Łukasz Nowak authored Jun 14, 2011
  
  2764645d
- Revert "Set static versions on erp5testnode" · fa780fd1
  Sebastien Robin authored Jun 14, 2011
```
erp5testnode is not fully stable yet, we often need to
update it, we don't need to fix everything right now
This reverts commit 7f251b0c.
```
  fa780fd1
- Merge branch 'master' into erp5 · 139cb718
  Łukasz Nowak authored Jun 14, 2011
  
  139cb718
- when no vcs_authentication_list was given, instanciation was failing · 853056ed
  Sebastien Robin authored Jun 14, 2011
  
  853056ed
- Froze for release. · f443b0f8
  Łukasz Nowak authored Jun 14, 2011
  
  f443b0f8
- Advertise development of slapos.cookbook 0.8 · 6c31c42f
  Łukasz Nowak authored Jun 14, 2011
  
  6c31c42f
- Prepare release slapos.cookbook 0.7 · d541d50e
  Łukasz Nowak authored Jun 14, 2011
  
  d541d50e
- Merge branch 'erp5testnode' · a1bd038f
  Sebastien Robin authored Jun 14, 2011
  
  a1bd038f
- Fill changelog. · fcdb035e
  Łukasz Nowak authored Jun 14, 2011
  
  fcdb035e
- Include site.zcml in package. · 08153c01
  Łukasz Nowak authored Jun 14, 2011
  
  08153c01
- Include site.zcml in package. · 913c54fe
  Łukasz Nowak authored Jun 14, 2011
  
  913c54fe
- minor small fixes (undefined parameters and empty stderr file) · a2f0c1df
  Sebastien Robin authored Jun 14, 2011
  
  a2f0c1df
- fixed typo · b7d7de9c
  Sebastien Robin authored Jun 14, 2011
  
  b7d7de9c
- fixed typo · 0bcd8886
  Sebastien Robin authored Jun 14, 2011
  
  0bcd8886
- remove blank lines · 8ac79f96
  Sebastien Robin authored Jun 14, 2011
  
  8ac79f96
- make runComputerPartition reporting errors to the master · 61354b40
  Sebastien Robin authored Jun 14, 2011
  
  61354b40
- move stdout and stderr file creation in testnode · 46ef504d
  Sebastien Robin authored Jun 14, 2011
```
This will allows to use it for several different external method
calls
```
  46ef504d
- explain what is done in stdout, usefull if problem reported on master · 2561fee5
  Sebastien Robin authored Jun 14, 2011
  
  2561fee5
- while true loop is useless, it is already done in testnode.py · cfd04459
  Sebastien Robin authored Jun 14, 2011
  
  cfd04459
- remove useless code already commented out · 66d8122d
  Sebastien Robin authored Jun 14, 2011
  
  66d8122d
- Merge branch 'master' into erp5testnode · 70d78c20
  Sebastien Robin authored Jun 14, 2011
  
  70d78c20
- version up : bison-2.5, coreutils-8.12, m4-1.4.16. · 0e03727d
  Kazuhiko Shiozaki authored Jun 14, 2011
  
  0e03727d
13 Jun, 2011 15 commits
- disable needless features explicitly. · 023abda8
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  023abda8
- Replace xpdf by poppler. · 5f7e7cb0
  Rafael Monnerat authored Jun 13, 2011
  
  5f7e7cb0
- libpng's header location is not considered in (at least) splash sub-directory. · 6792c765
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  6792c765
- typo. · eda94f12
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  eda94f12
- typo. · 3d611dde
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  3d611dde
- Initiate development of 0.7. · d2d28243
  Łukasz Nowak authored Jun 13, 2011
  
  d2d28243
- Prepare release 0.6. · 678edc04
  Łukasz Nowak authored Jun 13, 2011
  
  678edc04
- Use corrected file. · a35029c3
  Łukasz Nowak authored Jun 13, 2011
  
  a35029c3
- Merge branch 'vifib' into erp5 · a24faca6
  Łukasz Nowak authored Jun 13, 2011
  
  a24faca6
- Merge branch 'master' into erp5 · e7c338c2
  Łukasz Nowak authored Jun 13, 2011
```
Conflicts:
	CHANGES.txt
	setup.py
	software/erp5/software.cfg
	software/erp5testnode/software.cfg
```
  e7c338c2
- Use corrected file. · 18e066a3
  Łukasz Nowak authored Jun 13, 2011
  
  18e066a3
- typo. · f1a2c235
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  f1a2c235
- simplify "-Wl,-rpath -Wl,location" -> "-Wl,-rpath=location". · b009ec6c
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  b009ec6c
- use our own components. · 22b0df87
  Kazuhiko Shiozaki authored Jun 13, 2011
  
  22b0df87
- Merge branch 'erp5' into vifib · 2901f28a
  Rafael Monnerat authored Jun 13, 2011
  
  2901f28a