summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-08-16 15:33:57 +0100
committerAsk Solem <ask@celeryproject.org>2013-08-16 15:33:57 +0100
commitb68f8050c78867351f3e6340e1348c9c340d8ca4 (patch)
tree13bffbb68225876287f90c4e2d1b0db48ae04be4
parent2dddb52d5d19c8f9a9ffe3d10d581482af611ed5 (diff)
downloadkombu-b68f8050c78867351f3e6340e1348c9c340d8ca4.tar.gz
Updates Changelog
-rw-r--r--Changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 72a1f69b..0c293639 100644
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,15 @@
- Now depends on :mod:`amqp` 1.0.13
+- Fixed typo in Django functional tests.
+
+- safe_str now returns unicode in Python 2.x
+
+ Fix contributed by Germán M. Bravo.
+
+- amqp: Transport options are now merged with arguments
+ supplied to the connection.
+
.. _version-2.5.12:
2.5.12