Merge with 3.0 changelog

Changelog

@@ -10,6 +10,157 @@
 =====
 :release-date: TBA
 
+.. _version-3.0.26:
+
+3.0.26
+======
+:release-date: 2015-04-22 06:00 P.M UTC
+:release-by: Ask Solem
+
+- Fixed compatibility with py-redis versions before 2.10.3 (Issue #470).
+
+.. _version-3.0.25:
+
+3.0.25
+======
+:release-date: 2015-04-21 02:00 P.M UTC
+:release-by: Ask Solem
+
+- pyamqp/librabbitmq now uses 5671 as default port when SSL is enabled
+  (Issue #459).
+
+- Redis: Now supports passwords in ``redis+socket://:pass@host:port`` URLs
+  (Issue #460).
+
+- ``Producer.publish`` now defines the ``expiration`` property in support
+  of the `RabbitMQ per-message TTL extension`_.
+
+    Contributed by Anastasis Andronidis.
+
+- Connection transport attribute now set correctly for all transports.
+
+    Contributed by Alex Koshelev.
+
+- qpid: Fixed bug where the connectionw as not being closed properly.
+
+    Contributed by Brian Bouterse.
+
+- :class:`~kombu.entity.bindings` is now JSON serializable (Issue #453).
+
+    Contributed by Sergey Tikhonov.
+
+- Fixed typo in error when yaml is not installed (said ``msgpack``).
+
+    Contributed by Joshua Harlow.
+
+- Redis: Now properly handles ``TimeoutError raised by py-redis.
+
+    Contributed by markow.
+
+- qpid: Adds additional string to check for when connecting to qpid.
+
+    When we connect to qpid, we need to ensure that we skip to the next SASL
+    mechanism if the current mechanism fails. Otherwise, we will keep retrying the
+    connection with a non-working mech.
+
+    Contributed by Chris Duryee.
+
+- qpid: Handle ``NotFound`` exceptions.
+
+    Contributed by Brian Bouterse.
+
+- :class:`Queue.__repr__` now makes sure return value is not unicode
+  (Issue #440).
+
+- qpid: ``Queue.purge`` incorrectly raised :exc:`AttributeErrror` if the
+  does not exist (Issue #439).
+
+    Contributed by Brian Bouterse.
+
+- Linux: Now ignores permission errors on epoll unregister.
+
+.. _`RabbitMQ per-message TTL extension`: https://www.rabbitmq.com/ttl.html
+
+.. _version-3.0.24:
+
+3.0.24
+======
+:release-date: 2014-11-17 11:00 P.M UTC
+:release-by: Ask Solem
+
+- The `Qpid <http://qpid.apache.org/>`_ broker is supported for Python 2.x
+  environments. The Qpid transport includes full SSL support within Kombu. See
+  the :mod:`kombu.transport.qpid` docs for more info.
+
+    Contributed by Brian Bouterse and Chris Duryee through support from Red Hat.
+
+- Dependencies: extra[librabbitmq] now requires librabbitmq 1.6.0
+
+- Docstrings for :class:`~kombu.utils.limit.TokenBucket` did not match
+  implementation.
+
+    Fix contributed by Jesse Dhillon.
+
+- :func:`~kombu.common.oid_from` accidentally called ``uuid.getnode()`` but
+  did not use the return value.
+
+    Fix contributed by Alexander Todorov.
+
+- Redis: Now ignores errors when cosing the underlying connection.
+
+- Redis: Restoring messages will now use a single connection.
+
+- ``kombu.five.monotonic``: Can now be imported even if ctypes is not
+  available for some reason (e.g. App Engine)
+
+- Documentation: Improved example to use the ``declare`` argument to
+  ``Producer`` (Issue #423).
+
+- Django: Fixed ``app_label`` for older Django versions (``< 1.7``).
+  (Issue #414).
+
+.. _version-3.0.23:
+
+3.0.23
+======
+:release-date: 2014-09-14 10:45 P.M UTC
+:release-by: Ask Solem
+
+- Django: Fixed bug in the Django 1.7 compatibility improvements related
+  to autocommit handling.
+
+    Contributed by Radek Czajka.
+
+- Django: The Django transport models would not be created on syncdb
+  after app label rename (Issue #406).
+
+.. _version-3.0.22:
+
+3.0.22
+======
+:release-date: 2014-09-04 03:00 P.M UTC
+:release-by: Ask Solem
+
+- kombu.async: Min. delay between waiting for timer was always increased to
+  one second.
+
+- Fixed bug in itermessages where message is received after the with
+  statement exits the block.
+
+    Fixed by Rumyana Neykova
+
+- Connection.autoretry: Now works with functions missing wrapped attributes
+    (``__module__``, ``__name__``, ``__doc__``).  Fixes #392.
+
+    Contributed by johtso.
+
+- Django: Now sets custom app label for ``kombu.transport.django`` to work
+  with recent changes in Django 1.7.
+
+- SimpleQueue removed messages from the wrong end of buffer (Issue #380).
+
+- Tests: Now using ``unittest.mock`` if available (Issue #381).
+
 .. _version-3.0.21:
 
 3.0.21