Release slapos.cookbook 1.0.25

Conflicts: CHANGES.txt setup.py

Release slapos.cookbook 1.0.25
Conflicts: CHANGES.txt setup.py
0dfbf45b · Alain Takoudjou · a04ba384 · 0dfbf45b · 0dfbf45b
Commit 0dfbf45b authored Apr 15, 2016 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

CHANGES.txt CHANGES.txt +8 -0

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

+1.0.25 (2016-04-15)
+-------------------
+ * fixup slap configuration: provide instance and root instance title
+
+1.0.22 (2016-04-01)
+-------------------
+ * slap configuration: provide instance and root instance title
+
 1.0.16 (2015-10.27)
 -------------------
 * kvm recipe: fix bugs dowload image and disk creation

--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '1.0.18.dev0'
+version = '1.0.25'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"