Merge branch '2.5'

Conflicts:
	Changelog
	README.rst
	kombu/__init__.py
This commit is contained in:
Ask Solem 2013-10-11 17:42:23 +01:00
commit 372448c48a
1 changed files with 3 additions and 3 deletions

View File

@ -180,7 +180,7 @@ ZeroMQ transport: drain_events now supports timeout.
2.5.15
======
:release-date: 2013-09-XX XX:XX X.X 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.
@ -2252,10 +2252,10 @@ Important Notes
* Channel objects now have a ``channel_id`` attribute.
* MongoDB: Version sniffing broke with development versions of
mongod (Issue #29).
mongod (Issue #29).
* New environment variable :envvar:`KOMBU_LOG_CONNECTION` will now emit debug
log messages for connection related actions.
log messages for connection related actions.
:envvar:`KOMBU_LOG_DEBUG` will also enable :envvar:`KOMBU_LOG_CONNECTION`.