Commit cad416b3 authored by Priscila Manhaes's avatar Priscila Manhaes

Merge branch 'cloudooo' of https://git.erp5.org/repos/slapos into cloudooo

parents 504d3dcd 8028f2da
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
http://dist.repoze.org http://dist.repoze.org
http://www.nexedi.org/static/packages/source/ http://www.nexedi.org/static/packages/source/
http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
# Separate from site eggs # Separate from site eggs
allowed-eggs-from-site-packages = allowed-eggs-from-site-packages =
...@@ -89,11 +90,11 @@ recipe = slapos.recipe.template ...@@ -89,11 +90,11 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
md5sum = 525477aabca7349c328b69793d16b082 md5sum = 65ad4e63bb609b0b60225d60b53e3ee6
[versions] [versions]
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-003 zc.buildout = 1.6.0-dev-SlapOS-004
Jinja2 = 2.6 Jinja2 = 2.6
Werkzeug = 0.8.2 Werkzeug = 0.8.2
...@@ -112,9 +113,9 @@ Flask = 0.8 ...@@ -112,9 +113,9 @@ Flask = 0.8
# slapos.cookbook==0.38 # slapos.cookbook==0.38
PyXML = 0.8.5 PyXML = 0.8.5
# Required by: # Use patched hexagonit.recipe.download from
# hexagonit.recipe.cmmi==1.5.0 # https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.0 hexagonit.recipe.download = 1.5.1-dev-slapos-001
# Required by: # Required by:
# slapos.cookbook==0.38 # slapos.cookbook==0.38
...@@ -145,3 +146,21 @@ zc.recipe.egg = 1.3.2 ...@@ -145,3 +146,21 @@ zc.recipe.egg = 1.3.2
# Required by: # Required by:
# slapos.core==0.21 # slapos.core==0.21
zope.interface = 3.8.0 zope.interface = 3.8.0
[networkcache]
# signature certificates of the following uploaders.
# Gabriel Monnerat
signature-certificate-list =
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-----END CERTIFICATE-----
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