Commit b32f30c3 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into 1.0

parents de9b26ce 708f1308
Changes Changes
======= =======
1.0.16 (2015-10.27)
-------------------
* kvm recipe: fix bugs dowload image and disk creation
1.0.14 (2015-10.26) 1.0.14 (2015-10.26)
------------------- -------------------
* kvm recipe: Allow to set keyboard layout language used by qemu and VNC * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
......
...@@ -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.15.dev0' version = '1.0.15'
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"
......
...@@ -135,8 +135,8 @@ requests = 2.8.1 ...@@ -135,8 +135,8 @@ requests = 2.8.1
setuptools = 18.1 setuptools = 18.1
simplejson = 3.8.0 simplejson = 3.8.0
six = 1.10.0 six = 1.10.0
slapos.cookbook = 1.0.14 slapos.cookbook = 1.0.16
slapos.core = 1.3.13 slapos.core = 1.3.14
slapos.extension.strip = 0.1 slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.5 slapos.libnetworkcache = 0.14.5
slapos.recipe.build = 0.23 slapos.recipe.build = 0.23
...@@ -146,7 +146,7 @@ unicodecsv = 0.14.1 ...@@ -146,7 +146,7 @@ unicodecsv = 0.14.1
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
# Required by: # Required by:
# slapos.core==1.3.13 # slapos.core==1.3.14
Flask = 0.10.1 Flask = 0.10.1
# Required by: # Required by:
...@@ -171,15 +171,15 @@ functools32 = 3.2.3.post2 ...@@ -171,15 +171,15 @@ functools32 = 3.2.3.post2
ipaddress = 1.0.14 ipaddress = 1.0.14
# Required by: # Required by:
# slapos.cookbook==1.0.14 # slapos.cookbook==1.0.16
jsonschema = 2.5.1 jsonschema = 2.5.1
# Required by: # Required by:
# slapos.cookbook==1.0.14 # slapos.cookbook==1.0.16
lock-file = 2.0 lock-file = 2.0
# Required by: # Required by:
# slapos.core==1.3.13 # slapos.core==1.3.14
netifaces = 0.10.4 netifaces = 0.10.4
# Required by: # Required by:
...@@ -187,15 +187,15 @@ netifaces = 0.10.4 ...@@ -187,15 +187,15 @@ netifaces = 0.10.4
pycparser = 2.14 pycparser = 2.14
# Required by: # Required by:
# slapos.core==1.3.13 # slapos.core==1.3.14
supervisor = 3.1.3 supervisor = 3.1.3
# Required by: # Required by:
# slapos.core==1.3.13 # slapos.core==1.3.14
uritemplate = 0.6 uritemplate = 0.6
# Required by: # Required by:
# slapos.core==1.3.13 # slapos.core==1.3.14
zope.interface = 4.1.3 zope.interface = 4.1.3
[networkcache] [networkcache]
......
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