Merge branch 'prepare-2.6.2'

CHANGELOG.rst

@@ -3,18 +3,25 @@ Changelog
 
 This document describes changes between each past release.
 
-2.7.0 (unreleased)
+2.6.2 (2015-09-09)
 ------------------
 
-- Nothing changed yet.
+**Bug fixes**
+
+- Expose CORS headers on subrequest error response and for non service errors (#435).
+- Make sure a tuple is passed for Postgresql list comparisons even for ids (#443).
+
+**Internal changes**
+
+- Use the ``get_bound_permissions`` callback to select shared records in collection list (#444).
 
 
 2.6.1 (2015-09-08)
 ------------------
 
 **Bug fixes**
 
-- Make sure we pass a tuple to Postgresql in conditions (#441)
+- Make sure a tuple is passed for Postgresql in conditions (#441).
 
 
 2.6.0 (2015-09-08)

cliquet_docs/conf.py

@@ -68,7 +68,7 @@
 # The short X.Y version.
 version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.1'
+release = '2.6.2'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

setup.py

@@ -60,7 +60,7 @@
 
 
 setup(name='cliquet',
-      version='2.7.0.dev0',
+      version='2.6.2',
       description='Micro service API toolkit',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',