Commit 801f4a49 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'slapos'

parents f99e6daa 63d07f4a
...@@ -29,13 +29,13 @@ hexagonit.recipe.cmmi = 1.5.0 ...@@ -29,13 +29,13 @@ hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3 lxml = 2.3
meld3 = 0.6.7 meld3 = 0.6.7
setuptools = 0.6c12dev-r88795 setuptools = 0.6c12dev-r88795
slapos.core = 0.1 slapos.core = 0.2
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
# Required by: # Required by:
# slapos.core==0.1 # slapos.core==0.2
Flask = 0.6.1 Flask = 0.6.1
# Required by: # Required by:
...@@ -43,17 +43,18 @@ Flask = 0.6.1 ...@@ -43,17 +43,18 @@ Flask = 0.6.1
hexagonit.recipe.download = 1.5.0 hexagonit.recipe.download = 1.5.0
# Required by: # Required by:
# slapos.core==0.1 # slapos.core==0.2
netaddr = 0.7.5 netaddr = 0.7.5
# Required by: # Required by:
# slapos.core==0.1 # slapos.core==0.2
netifaces = 0.5 netifaces = 0.5
# Required by: # Required by:
# slapos.core==0.1 # slapos.core==0.2
supervisor = 3.0a10 supervisor = 3.0a10
# Required by: # Required by:
# slapos.core==0.1 # slapos.core==0.2
zope.interface = 3.6.3 zope.interface = 3.6.3
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