Commit 37427ee7 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5-component' into erp5

parents 01a467f4 8c0cac2d
...@@ -144,6 +144,7 @@ zc.recipe.egg = 1.3.2 ...@@ -144,6 +144,7 @@ zc.recipe.egg = 1.3.2
# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz # Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
hexagonit.recipe.download = 1.7nxd002 hexagonit.recipe.download = 1.7nxd002
slapos.core = 1.0.0
Jinja2 = 2.7.1 Jinja2 = 2.7.1
MarkupSafe = 0.18 MarkupSafe = 0.18
Pygments = 1.6 Pygments = 1.6
...@@ -158,42 +159,40 @@ netaddr = 0.7.10 ...@@ -158,42 +159,40 @@ netaddr = 0.7.10
prettytable = 0.7.2 prettytable = 0.7.2
pyOpenSSL = 0.13.1 pyOpenSSL = 0.13.1
pyparsing = 2.0.1 pyparsing = 2.0.1
setuptools = 1.1.6 setuptools = 2.0.2
slapos.core = 1.0.0rc6
slapos.libnetworkcache = 0.13.4 slapos.libnetworkcache = 0.13.4
slapos.recipe.cmmi = 0.1.1 slapos.recipe.cmmi = 0.1.1
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
Flask = 0.10.1 Flask = 0.10.1
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
bpython = 0.12 bpython = 0.12
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
cliff = 1.4.5 cliff = 1.4.5
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
ipython = 1.1.0 ipython = 1.1.0
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
netifaces = 0.8 netifaces = 0.8
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
requests = 2.0.0 requests = 2.1.0
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
supervisor = 3.0 supervisor = 3.0
# Required by: # Required by:
# slapos.core==1.0.0rc6 # slapos.core==1.0.0
zope.interface = 4.0.5 zope.interface = 4.0.5
...@@ -8,4 +8,4 @@ find-links += ...@@ -8,4 +8,4 @@ find-links +=
http://www.nexedi.org/static/packages/source/slapos.core-testing/ http://www.nexedi.org/static/packages/source/slapos.core-testing/
[versions] [versions]
slapos.core = slapos.core = 1.0.0rc6
...@@ -611,7 +611,7 @@ zope.app.testing = 3.8.1 ...@@ -611,7 +611,7 @@ zope.app.testing = 3.8.1
# Pinned versions # Pinned versions
Flask = 0.9 Flask = 0.9
GitPython = 0.3.2.RC1 GitPython = 0.3.2.RC1
MySQL-python = 1.2.4 MySQL-python = 1.2.5
PIL = 1.1.7 PIL = 1.1.7
PyXML = 0.8.5 PyXML = 0.8.5
PasteDeploy = 1.5.0 PasteDeploy = 1.5.0
......
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