Skip to content

Commit

Permalink
Merge branch 'prepare-4.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémy HUBSCHER committed Aug 29, 2016
2 parents 76f363c + 3850f27 commit 2bdc928
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 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.

4.2.0 (unreleased)
4.1.1 (2016-08-29)
------------------

**Bug fixes**
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# The short X.Y version.
version = '4.1'
# The full version, including alpha/beta/rc tags.
release = '4.1.0'
release = '4.1.1'

# 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/4.0.0/kinto/core/__init__.py#L23-L90>`.
refer to the *Kinto* :github:`source code <Kinto/kinto/blob/4.1.1/kinto/core/__init__.py#L23-L90>`.


By default, nobody can read buckets list. You can change that using:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pyramid==1.7.3
pyramid-multiauth==0.8.0
pyramid-tm==0.12.1
python-dateutil==2.5.3
raven==5.24.3
raven==5.25.0
repoze.lru==0.6
requests==2.11.1
simplejson==3.8.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def read_file(filename):


setup(name='kinto',
version='4.2.0.dev0',
version='4.1.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)',
Expand Down

0 comments on commit 2bdc928

Please sign in to comment.