Skip to content

Commit

Permalink
Merge pull request #663 from Kinto/prepare-3.2.0
Browse files Browse the repository at this point in the history
Preparing release 3.2.0
  • Loading branch information
leplatrem authored Jun 14, 2016
2 parents 62f26ff + 7f0610a commit 8532d6c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changelog

This document describes changes between each past release.

3.1.1 (unreleased)
3.2.0 (2016-06-14)
==================

**Protocol**
Expand Down Expand Up @@ -38,6 +38,12 @@ Protocol is now at version **1.7**. See `API changelog <http://kinto.readthedocs

- Mention in groups documentation that the principal of a group to be used in a permissions
definition is the full URI (e.g. ``"write": ["/buckets/blog/groups/authors"]``)
- Fix typo in Github tutorial (thanks @SwhGo_oN, #673)
- New Kinto logo (thanks @AymericFaivre, #676)
- Add a slack badge to the README (#675)
- Add new questions on FAQ (thanks @enguerran, #678)
- Fix links to examples (thanks @maxdow, #680)


3.1.0 (2016-05-24)
==================
Expand Down
5 changes: 4 additions & 1 deletion CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Contributors
* Aditya Bhasin <[email protected]>
* Alexis Metaireau <[email protected]>
* Andy McKay <[email protected]>
* Aymeric Faivre <[email protected]>
* Ayush Sharma <[email protected]>
* Balthazar Rouberol <[email protected]>
* Chirag B. Jadwani <[email protected]>
Expand All @@ -13,6 +14,7 @@ Contributors
* David Larlet <[email protected]>
* Enguerran <[email protected]>
* Eric Bréhault <[email protected]>
* Éric Lemoine <[email protected]>
* Ethan Glasser-Camp <[email protected]>
* Fil <[email protected]>
* FooBarQuaxx
Expand All @@ -26,6 +28,7 @@ Contributors
* Masataka Takeuchi <[email protected]>
* Mathieu Agopian <[email protected]>
* Mathieu Leplatre <[email protected]>
* Maxime Varnier <[email protected]>
* Michiel de Jong <[email protected]>
* Nicolas Hoizey <[email protected]>
* Nicolas Perriault <[email protected]>
Expand All @@ -35,8 +38,8 @@ Contributors
* Rémy Hubscher <[email protected]>
* Shweta Oak <[email protected]>
* Sofia Utsch <[email protected]>
* SwhGo_oN
* Tarek Ziade <[email protected]>
* Taylor Zane Glaeser <[email protected]>
* Wil Clouser <[email protected]>
* Yann Klis <[email protected]>
* Éric Lemoine <[email protected]>
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
# built documents.
#
# The short X.Y version.
version = '3.1'
version = '3.2'
# The full version, including alpha/beta/rc tags.
release = '3.1.0'
release = '3.2.0'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/production.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0/kinto/core/__init__.py#L23-L88>`.
refer to the *Kinto* :github:`source code <Kinto/kinto/blob/3.2.0/kinto/core/__init__.py#L23-L89>`.


By default, nobody can read buckets list. You can change that using:
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ contextlib2==0.5.3
cornice==1.2.1
enum34==1.1.6
functools32==3.2.3.post2
futures==3.0.5
iso8601==0.1.11
jsonschema==2.5.1
newrelic==2.64.0.48
newrelic==2.66.0.49
PasteDeploy==1.5.2
psycopg2==2.6.1
pyramid==1.7
pyramid-multiauth==0.8.0
pyramid-tm==0.12.1
python-dateutil==2.5.3
raven==5.18.0
raven==5.19.0
redis==2.10.5
repoze.lru==0.6
requests==2.10.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def read_file(filename):


setup(name='kinto',
version='3.1.1.dev0',
version='3.2.0',
description='Kinto Web Service - Store, Sync, Share, and Self-Host.',
long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
license='Apache License (2.0)',
Expand Down

0 comments on commit 8532d6c

Please sign in to comment.