From d3259de7917a0808de35b6cae9742c52e8185999 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 4 Oct 2013 15:19:59 +0100
Subject: [PATCH 1/5] Fixes tests

---
 kombu/tests/test_common.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kombu/tests/test_common.py b/kombu/tests/test_common.py
index d315fdbb..14d2441a 100644
--- a/kombu/tests/test_common.py
+++ b/kombu/tests/test_common.py
@@ -84,7 +84,9 @@ class test_maybe_declare(TestCase):
 
         maybe_declare(entity, channel)
         self.assertEqual(entity.declare.call_count, 1)
-        self.assertIn(entity, channel.connection.client.declared_entities)
+        self.assertIn(
+            hash(entity), channel.connection.client.declared_entities,
+        )
 
         maybe_declare(entity, channel)
         self.assertEqual(entity.declare.call_count, 1)

From 00efce7d9f9b8740e8df889987caf55700fd1b77 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 4 Oct 2013 15:21:11 +0100
Subject: [PATCH 2/5] Bumps version to 2.5.15

---
 Changelog         | 2 +-
 README.rst        | 2 +-
 kombu/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index e75cd276..476ac56e 100644
--- a/Changelog
+++ b/Changelog
@@ -8,7 +8,7 @@
 
 2.5.15
 ======
-:release-date: 2014-09-XX XX:XX X.X BST
+:release-date: 2013-09-04 03:30 P.M BST
 
 - Declaration cache: Now only keeps hash of declaration
   so that it does not keep a reference to the channel.
diff --git a/README.rst b/README.rst
index d9a655be..91d98c7c 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.14
+:Version: 2.5.15
 
 `Kombu` is a messaging framework for Python.
 
diff --git a/kombu/__init__.py b/kombu/__init__.py
index 56d511de..b56f7061 100644
--- a/kombu/__init__.py
+++ b/kombu/__init__.py
@@ -1,7 +1,7 @@
 """Messaging Framework for Python"""
 from __future__ import absolute_import
 
-VERSION = (2, 5, 14)
+VERSION = (2, 5, 15)
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
 __author__ = 'Ask Solem'
 __contact__ = 'ask@celeryproject.org'

From 7c2ade4edc1248e5f7196a146638e9e07c9d0f55 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 11 Oct 2013 14:38:22 +0100
Subject: [PATCH 3/5] Fixed typo 2014 -> 2013

---
 Changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 476ac56e..1529f981 100644
--- a/Changelog
+++ b/Changelog
@@ -26,7 +26,7 @@
 
 2.5.14
 ======
-:release-date: 2014-08-23 17:00 P.M BST
+:release-date: 2013-08-23 17:00 P.M BST
 
 - safe_str did not work properly resulting in
   :exc:`UnicodeDecodeError` (Issue #248).

From f35b4571db0295cafd026783934229d00c27cbdd Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 11 Oct 2013 16:32:32 +0100
Subject: [PATCH 4/5] Wording

---
 kombu/serialization.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kombu/serialization.py b/kombu/serialization.py
index 1495dbc8..3f14535a 100644
--- a/kombu/serialization.py
+++ b/kombu/serialization.py
@@ -390,8 +390,7 @@ register_pickle()
 register_yaml()
 register_msgpack()
 
-# JSON is assumed to always be available, so is the default.
-# (this matches the historical use of kombu.)
+# Default serializer is 'json'
 registry._set_default_serializer('json')
 
 

From a7410f03a7f886b2bb9b626f0fd9b756c1c6d086 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 11 Oct 2013 16:35:21 +0100
Subject: [PATCH 5/5] Fixed wrong dates in Changelog

---
 Changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 1529f981..a9a54899 100644
--- a/Changelog
+++ b/Changelog
@@ -8,7 +8,7 @@
 
 2.5.15
 ======
-:release-date: 2013-09-04 03:30 P.M BST
+:release-date: 2013-10-04 03:30 P.M BST
 
 - Declaration cache: Now only keeps hash of declaration
   so that it does not keep a reference to the channel.