Merge pull request #500 from Kinto/upgrade-cliquet-3.1

Upgrade to cliquet 3.1 (fixes #489)
Kinto · Mar 8, 2016 · 46d811b · 46d811b
2 parents 0fc55b0 + 819fd2a
commit 46d811b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -19,6 +19,7 @@ This document describes changes between each past release.
   thanks @ayusharma)
 - Server now returns 415 error response if client cannot accept JSON response (#461, mozilla-services/cliquet#667)
 - Server now returns 415 error response if client does not send JSON request (#461, mozilla-services/cliquet#667)
+- Add the ``__lbheartbeat__`` endpoint, for load balancer membership test.
 
 Protocol is now version 1.4. See `API changelog <http://kinto.readthedocs.org/en/latest/api/>`_.
 
@@ -52,6 +53,7 @@ Protocol is now version 1.4. See `API changelog <http://kinto.readthedocs.org/en
   in database is done and successful.
   `See more details <http://cliquet.readthedocs.org/en/latest/reference/notifications.html>`_.
 - Track execution time on StatsD for each authentication sub-policy (mozilla-services/cliquet#639)
+- Default console log renderer now has colours (mozilla-service/cliquet#671)
 
 **Bug fixes**
 
@@ -62,6 +64,8 @@ Protocol is now version 1.4. See `API changelog <http://kinto.readthedocs.org/en
 - Fix statsd initialization on storage (mozilla-services/cliquet#637)
 - Providing bad last modified values on delete now returns 400 (mozilla-services/cliquet#665)
 - Providing last modified in the past for delete now follows behaviour create/update (mozilla-services/cliquet#665)
+- Do not always return 412 errors when request header ``If-None-Match: *``
+  is sent on ``POST /collection`` (fixes #489, mozilla-service/cliquet#673)
 
 **Internal changes**
 

diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -23,7 +23,7 @@ Changelog
 - List responses are now sorted by last_modified descending by default
 - Return 415 error response if client cannot accept JSON response
 - Return 415 error response if client does not send JSON request
-
+- Add the ``GET /v1/__lbheartbeat__`` endpoint, for load balancer membership test.
 
 1.3 (2016-01-28)
 ''''''''''''''''

diff --git a/setup.py b/setup.py
@@ -18,16 +18,16 @@ def read_file(filename):
 
 REQUIREMENTS = [
     'waitress',
-    'cliquet>=3,<4',
+    'cliquet>=3.1,<4',
     'jsonschema',
 ]
 
 POSTGRESQL_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[postgresql]>=3,<4'
+    'cliquet[postgresql]>=3.1,<4'
 ]
 
 MONITORING_REQUIREMENTS = REQUIREMENTS + [
-    'cliquet[monitoring]>=3,<4'
+    'cliquet[monitoring]>=3.1,<4'
 ]
 
 FXA_REQUIREMENTS = REQUIREMENTS + [