Merge branch 'master' into 1.0

4c531834 · Alain Takoudjou · aeda7fbd · d5eb5350 · 4c531834
Commit 4c531834 authored Apr 15, 2016 by Alain Takoudjou
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

stack/slapos.cfg stack/slapos.cfg +3 -3

No files found.
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -135,7 +135,7 @@ requests = 2.9.1
 setuptools = 19.6.2
 simplejson = 3.8.2
 six = 1.10.0
-slapos.cookbook = 1.0.22
+slapos.cookbook = 1.0.25
 slapos.core = 1.3.15
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
@@ -166,11 +166,11 @@ functools32 = 3.2.3.post2
 ipaddress = 1.0.16

 # Required by:
-# slapos.cookbook==1.0.22
+# slapos.cookbook==1.0.25
 jsonschema = 2.5.1

 # Required by:
-# slapos.cookbook==1.0.22
+# slapos.cookbook==1.0.25
 lock-file = 2.0

 # Required by: