diff options
| author | Ask Solem <ask@celeryproject.org> | 2011-11-28 15:47:26 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2011-11-28 15:47:26 +0000 |
| commit | 339607c2f96224d26cccb443e27f9050dc8be2d6 (patch) | |
| tree | e3cdae97980451f38c9599062631cd87e18ba424 /docs | |
| parent | 246e42efed5dbbfd0a30f297a838d0b6e791b3cf (diff) | |
| parent | 2c459e4c8c63995a56e429ae767166147237fd76 (diff) | |
| download | kombu-339607c2f96224d26cccb443e27f9050dc8be2d6.tar.gz | |
Merge branch 'master' into 2.0-devel
Conflicts:
README.rst
kombu/__init__.py
kombu/compat.py
kombu/connection.py
kombu/entity.py
kombu/messaging.py
kombu/pools.py
kombu/syn.py
kombu/tests/__init__.py
kombu/tests/test_transport_virtual.py
kombu/transport/redis.py
kombu/utils/encoding.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/kombu.syn.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/reference/kombu.syn.rst b/docs/reference/kombu.syn.rst index d3e1d23c..f5c650be 100644 --- a/docs/reference/kombu.syn.rst +++ b/docs/reference/kombu.syn.rst @@ -7,5 +7,5 @@ .. currentmodule:: kombu.syn .. automodule:: kombu.syn - :members: - :undoc-members: + + .. autofunction:: detect_environment |