Commit 55efe1b5 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge branch 'master' into kvm

parents 7497b3cd 3eb9acdd
0.13 (unreleased) 0.14 (unreleased)
================ =================
* No changes yet.
0.13 (2011-07-13)
=================
* No change yet. * Implement generic execute_wait wrapper, which allows to wait for some files
to appear before starting service depending on it. [Łukasz Nowak]
0.12 (2011-07-11) 0.12 (2011-07-11)
================= =================
......
...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages ...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.13dev' version = '0.14-dev'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
......
...@@ -63,13 +63,13 @@ output = ${buildout:directory}/template.cfg ...@@ -63,13 +63,13 @@ output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[versions] [versions]
slapos.cookbook = 0.7 slapos.cookbook = 0.13
erp5.recipe.cmmiforcei686 = 0.1.1 erp5.recipe.cmmiforcei686 = 0.1.1
hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.download = 1.5.0 hexagonit.recipe.download = 1.5.0
# Required by slapos.cookbook==0.7 # Required by slapos.cookbook==0.13
slapos.core = 0.2 slapos.core = 0.2
collective.recipe.template = 1.8 collective.recipe.template = 1.8
netaddr = 0.7.5 netaddr = 0.7.5
......
...@@ -66,9 +66,9 @@ output = ${buildout:directory}/template.cfg ...@@ -66,9 +66,9 @@ output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[versions] [versions]
slapos.cookbook = 0.9 slapos.cookbook = 0.13
# Required by slapos.cookbook==0.9 # Required by slapos.cookbook==0.13
slapos.core = 0.4 slapos.core = 0.4
collective.recipe.template = 1.8 collective.recipe.template = 1.8
netaddr = 0.7.5 netaddr = 0.7.5
......
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