Merge branch 'prepare-release-0.2.1'

Kinto · Mar 25, 2015 · 9017ff5 · 9017ff5
2 parents cabdb9c + fd084c6
commit 9017ff5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,12 +4,22 @@ Changelog
 This document describes changes between each past release.
 
 
-0.3 (unreleased)
-================
+0.2.2 (unreleased)
+==================
 
 - Nothing changed yet.
 
 
+0.2.1 (2015-03-25)
+==================
+
+- Upgraded to *cliquet* 1.4.1
+
+**Bug fixes**
+
+- Rely on Pyramid API to build pagination Next-Url (#147)
+
+
 0.2 (2015-03-24)
 ================
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.2.1'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
     'cornice',
     'six',
     'waitress',
-    'cliquet[postgresql,monitoring] >= 1.4.0'
+    'cliquet[postgresql,monitoring] >= 1.4.1'
 ]
 
 ENTRY_POINTS = {
@@ -25,7 +25,7 @@
 
 
 setup(name='kinto',
-      version='0.3.dev0',
+      version='0.2.2.dev0',
       description='kinto',
       long_description=README + "\n\n" + CHANGELOG,
       license='Apache License (2.0)',