Merge branch 'master' into 1.0

af7d7839 · Alain Takoudjou · 322415c1 · b8d4cc97 · af7d7839
Commit af7d7839 authored Aug 18, 2015 by Alain Takoudjou
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

stack/slapos.cfg stack/slapos.cfg +1 -1

No files found.
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -133,7 +133,7 @@ requests = 2.7.0
 setuptools = 18.0.1
 simplejson = 3.8.0
 six = 1.9.0
-slapos.cookbook = 0.103
+slapos.cookbook = 1.0.9
 slapos.core = 1.3.10
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.2