Commit a7ff5fa9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-z2.13

parents 5d3731e9 382d0eba
...@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio ...@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
[phantomjs-wrapper] [phantomjs-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/bin/phantomjs command-line = ${phantomjs:location}/phantomjs-slapos
wrapper-path = $${directory:bin}/phantomjs wrapper-path = $${directory:bin}/phantomjs
parameters_extra = true parameters_extra = true
...@@ -43,7 +43,7 @@ recipe = slapos.recipe.template ...@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
# MD5 checksum can be skipped for development, but must be filled for production # MD5 checksum can be skipped for development, but must be filled for production
md5sum = 1ef1bc6a3fb81300ce7139c512af96d7 md5sum = 94421503ca09f77ee1e94e4b1ef4e6a7
mode = 0644 mode = 0644
[jio-repository] [jio-repository]
......
...@@ -643,7 +643,7 @@ greenlet = 0.4.0 ...@@ -643,7 +643,7 @@ greenlet = 0.4.0
hexagonit.recipe.cmmi = 1.6 hexagonit.recipe.cmmi = 1.6
http-parser = 0.8.1 http-parser = 0.8.1
huBarcode = 0.63 huBarcode = 0.63
inotifyx = 0.2.0-1 inotifyx = 0.2.0
ipdb = 0.7 ipdb = 0.7
ipython = 0.13.2 ipython = 0.13.2
meld3 = 0.6.10 meld3 = 0.6.10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment