diff options
| author | Ask Solem <ask@celeryproject.org> | 2012-11-27 15:48:42 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2012-11-27 15:48:42 +0000 |
| commit | f68f8ac8c0808c6c33f3c4cbab7c7932e1ccd48d (patch) | |
| tree | a4ec01bc6f13bb11ece248c5384103c76f3bc22b /kombu/mixins.py | |
| parent | 325fcc0522571096b424080c232f0d87a1e5865e (diff) | |
| parent | 6b77885cf0e26b0f08a38db08835e8e43cd3ae91 (diff) | |
| download | kombu-f68f8ac8c0808c6c33f3c4cbab7c7932e1ccd48d.tar.gz | |
Merge branch 'master' into 3.0
Conflicts:
kombu/abstract.py
kombu/clocks.py
kombu/messaging.py
kombu/pidbox.py
kombu/pools.py
kombu/tests/mocks.py
kombu/tests/test_common.py
kombu/tests/test_messaging.py
kombu/tests/test_serialization.py
kombu/tests/test_utils.py
kombu/tests/transport/test_redis.py
kombu/tests/utilities/test_encoding.py
kombu/transport/pika.py
kombu/transport/zmq.py
kombu/transport/zookeeper.py
kombu/utils/__init__.py
kombu/utils/encoding.py
kombu/utils/finalize.py
pavement.py
requirements/default.txt
Diffstat (limited to 'kombu/mixins.py')
| -rw-r--r-- | kombu/mixins.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kombu/mixins.py b/kombu/mixins.py index 818b5563..5b0dcbf4 100644 --- a/kombu/mixins.py +++ b/kombu/mixins.py @@ -4,9 +4,6 @@ kombu.mixins Useful mixin classes. -:copyright: (c) 2009 - 2012 by Ask Solem. -:license: BSD, see LICENSE for more details. - """ from __future__ import absolute_import |