Commit b23f0aa2 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into 1.0

parents 568dc198 f61a49fc
Changes Changes
======= =======
1.0.48 (2017-01-31)
-------------------
* random-recipe: add option create-once to prevent storage file deletion by buildout
1.0.45 (2017-01-09) 1.0.45 (2017-01-09)
------------------- -------------------
......
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '1.0.46.dev0' version = '1.0.48'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.rst").read() + "\n" + \ long_description = open("README.rst").read() + "\n" + \
open("CHANGES.rst").read() + "\n" open("CHANGES.rst").read() + "\n"
......
...@@ -135,7 +135,7 @@ pytz = 2016.10 ...@@ -135,7 +135,7 @@ pytz = 2016.10
requests = 2.12.5 requests = 2.12.5
setuptools = 19.6.2 setuptools = 19.6.2
six = 1.10.0 six = 1.10.0
slapos.cookbook = 1.0.45 slapos.cookbook = 1.0.48
slapos.core = 1.3.18 slapos.core = 1.3.18
slapos.extension.strip = 0.2 slapos.extension.strip = 0.2
slapos.libnetworkcache = 0.14.5 slapos.libnetworkcache = 0.14.5
...@@ -162,7 +162,7 @@ functools32 = 3.2.3.post2 ...@@ -162,7 +162,7 @@ functools32 = 3.2.3.post2
ipaddress = 1.0.18 ipaddress = 1.0.18
# Required by: # Required by:
# slapos.cookbook==1.0.45 # slapos.cookbook==1.0.48
jsonschema = 2.5.1 jsonschema = 2.5.1
# Required by: # Required by:
......
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