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-1.4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
leplatrem committed Mar 27, 2015
2 parents 8e51276 + 4170d67 commit cf59b8e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
24 changes: 22 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,30 @@ Changelog

This document describes changes between each past release.

1.4.2 (unreleased)
1.5.0 (2015-03-27)
------------------

- Nothing changed yet.
**New features**

- Mesure calls on the authentication policy (#167)

**Breaking changes**

- Prefix statsd metrics with the value of `cliquet.statsd_prefix` or
`cliquet.project_name` (#162)
- `http_scheme` setting has been replaced by `cliquet.http_scheme` and
`cliquet.http_host` was introduced ((#151, #166)
- URL in the hello view now has version prefix (#165)

**Bug fixes**

- Fix Next-Page url if service has key in url (#158)
- Fix some PostgreSQL connection bottlenecks (#170)

**Internal changes**

- Update of PyFxA to get it working with gevent monkey patching (#168)
- Reload kinto on changes (#158)


1.4.1 (2015-03-25)
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'colander',
'cornice >= 0.20', # Fixes cors.
'python-dateutil',
'pyfxa >= 0.0.3', # Has cache support.
'pyfxa >= 0.0.6', # Gevent support
'pyramid_multiauth',
'redis', # Default backend
'requests',
Expand All @@ -27,7 +27,6 @@
]

DEPENDENCY_LINKS = [
'https://github.com/mozilla/PyFxA/tarball/use_gevent_if_present#egg=PyFxA-0.0.5',
]

POSTGRESQL_REQUIRES = [
Expand All @@ -40,7 +39,7 @@
]

setup(name='cliquet',
version='1.4.2.dev0',
version='1.5.0',
description='cliquet',
long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
license='Apache License (2.0)',
Expand Down

0 comments on commit cf59b8e

Please sign in to comment.