Merge pull request #415 from Kinto/prepare-1.11.1

Preparing release 1.11.1
Kinto · Feb 1, 2016 · 0ad3698 · 0ad3698
2 parents 310a674 + ab64272
commit 0ad3698
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,10 +3,18 @@ Changelog
 
 This document describes changes between each past release.
 
-1.12.0 (unreleased)
+1.11.1 (2016-02-01)
 ===================
 
-- Nothing changed yet.
+**Bug fixes**
+
+- Fix wheels for Python 3 that were requiring the functools32 package that is
+  for Python 2 only (fixes #303).
+
+**Documentation**
+
+- Fix a broken hyperlink in the overview section. (#406, thanks William Hoang)
+- Talk about tokens rather than user:password (#393)
 
 
 1.11.0 (2016-01-28)

diff --git a/docs/conf.py b/docs/conf.py
@@ -93,7 +93,7 @@
 # The short X.Y version.
 version = '1.11'
 # The full version, including alpha/beta/rc tags.
-release = '1.11.0'
+release = '1.11.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
@@ -47,7 +47,7 @@ def read_file(filename):
 ]
 
 setup(name='kinto',
-      version='1.12.0.dev0',
+      version='1.11.1',
       description='Kinto Web Service - Store, Sync, Share, and Self-Host.',
       long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
       license='Apache License (2.0)',