diff options
| author | Ask Solem <ask@celeryproject.org> | 2014-06-11 14:55:11 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2014-06-11 14:55:11 +0100 |
| commit | 6524bd293ab580eaa1ac239de38e99856d07c282 (patch) | |
| tree | df953960f43fed46472469473df82620c4786269 /kombu/transport/pyamqp.py | |
| parent | e6a3e7eaf233937efe967faa56aab8e6c5b059dd (diff) | |
| parent | 244b882e0c103b915e98de6ebb7d0cb026974515 (diff) | |
| download | kombu-6524bd293ab580eaa1ac239de38e99856d07c282.tar.gz | |
Merge branch 'master' into curlclientcurlclient
Conflicts:
kombu/async/hub.py
kombu/tests/case.py
kombu/tests/transport/test_redis.py
kombu/transport/SQS.py
Diffstat (limited to 'kombu/transport/pyamqp.py')
0 files changed, 0 insertions, 0 deletions