Skip to content
This repository has been archived by the owner on Mar 28, 2019. It is now read-only.

Commit

Permalink
Merge branch 'prepare-3.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémy HUBSCHER committed May 18, 2016
2 parents 386e076 + 4b456e1 commit 6c14bd6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ Changelog
This document describes changes between each past release.


3.2.0 (unreleased)
3.1.5 (2016-05-17)
------------------

- Nothing changed yet.
**Bug fixes**

- Prevent the browser to cache server responses between two sessions. (#593)


3.1.4 (2016-05-10)
Expand Down
2 changes: 1 addition & 1 deletion cliquet_docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def setup(app):
# The short X.Y version.
version = '3.1'
# The full version, including alpha/beta/rc tags.
release = '3.1.4'
release = '3.1.5'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ colander==1.2
colorama==0.3.7
contextlib2==0.5.3
cornice==1.2.1
enum34==1.1.5
enum34==1.1.6
iso8601==0.1.11
newrelic==2.64.0.48
PasteDeploy==1.5.2
Expand All @@ -11,13 +11,13 @@ pyramid==1.6.1
pyramid-multiauth==0.8.0
pyramid-tm==0.12.1
python-dateutil==2.5.3
raven==5.16.0
raven==5.17.0
redis==2.10.5
repoze.lru==0.6
requests==2.10.0
simplejson==3.8.2
six==1.10.0
SQLAlchemy==1.0.12
SQLAlchemy==1.0.13
statsd==3.2.1
structlog==16.0.0
transaction==1.5.0
Expand All @@ -26,7 +26,6 @@ ujson==1.35
venusian==1.0
WebOb==1.6.0
Werkzeug==0.11.9
wheel==0.24.0
zope.deprecation==4.1.2
zope.interface==4.1.3
zope.sqlalchemy==0.7.6
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@


setup(name='cliquet',
version='3.2.0.dev0',
version='3.1.5',
description='Micro service API toolkit',
long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
license='Apache License (2.0)',
Expand Down

0 comments on commit 6c14bd6

Please sign in to comment.