Merge branch 'master' into rename_instance

489c93a5 · Antoine Catton · 29343e47 · 8b144521 · 489c93a5 · 489c93a5
Commit 489c93a5 authored Dec 26, 2011 by Antoine Catton
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

CHANGES.txt CHANGES.txt +6 -1

setup.py setup.py +1 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======
-0.21 (unreleased)
+0.22 (unreleased)
 -----------------
 * No changes yet.
+0.21 (2011-12-23)
+-----------------
+ * slap: Add renaming API. [Antoine Catton]
 0.20 (2011-11-24)
 -----------------

--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
-version = '0.21-dev'
+version = '0.22-dev'
 name = 'slapos.core'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"