Merge branch 'prepare-3.3.1'

jlong49 · Jul 20, 2016 · 8d44754 · 8d44754
2 parents 8f2dad9 + 8b9fc4c
commit 8d44754
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,10 +3,12 @@ Changelog
 
 This document describes changes between each past release.
 
-3.4.0 (unreleased)
+3.3.1 (2016-07-19)
 ==================
 
-- Add the ``permissions_endpoint`` capability. (#722)
+**Protocol**
+
+- Add the ``permissions_endpoint`` capability when the ``kinto.experimental_permissions_endpoint`` is set. (#722)
 
 
 3.3.0 (2016-07-18)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -1,14 +1,15 @@
 Contributors
 ============
 
-* Adam Chainz <[email protected]>
 * Aaron Egaas <[email protected]>
+* Adam Chainz <[email protected]>
 * Aditya Bhasin <[email protected]>
 * Alexis Metaireau <[email protected]>
 * Andy McKay <[email protected]>
 * Aymeric Faivre <[email protected]>
 * Ayush Sharma <[email protected]>
 * Balthazar Rouberol <[email protected]>
+* Boris Feld <[email protected]>
 * Chirag B. Jadwani <[email protected]>
 * Clément Villain <[email protected]>
 * Dan Phrawzty <[email protected]>

diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -11,7 +11,7 @@ API
 Changelog
 ---------
 
-1.8 (unreleased)
+1.8 (2016-07-19)
 ''''''''''''''''
 
 - Add new endpoint ``GET /v1/permissions`` to retrieve the list of permissions

diff --git a/docs/configuration/production.rst b/docs/configuration/production.rst
@@ -129,7 +129,7 @@ adjustments:
 .. note::
 
     For an exhaustive list of available settings and their default values,
-    refer to the *Kinto* :github:`source code <Kinto/kinto/blob/3.2.0/kinto/core/__init__.py#L23-L89>`.
+    refer to the *Kinto* :github:`source code <Kinto/kinto/blob/3.3.1/kinto/core/__init__.py#L23-L89>`.
 
 
 By default, nobody can read buckets list. You can change that using:

diff --git a/setup.py b/setup.py
@@ -71,7 +71,7 @@ def read_file(filename):
 
 
 setup(name='kinto',
-      version='3.4.0.dev0',
+      version='3.3.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)',