summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorBrian Bouterse <bmbouter@gmail.com>2014-05-28 10:05:56 -0400
committerBrian Bouterse <bmbouter@gmail.com>2014-05-28 10:05:56 -0400
commit95c729b3f2861d52b2f67edd3ee073b718eab58e (patch)
treecfd19ee3f192b8ed141eb10d5a2a1ed268d5f826 /README.rst
parentdd39577b8aef79f10340015824edc60fc530c620 (diff)
parent86274e967d900077f5e509d436d92f5a5db34b63 (diff)
downloadkombu-95c729b3f2861d52b2f67edd3ee073b718eab58e.tar.gz
Merge branch 'master' into qpid-transport
Conflicts: README.rst docs/userguide/connections.rst
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst57
1 files changed, 29 insertions, 28 deletions
diff --git a/README.rst b/README.rst
index e3c6a116..48598d4f 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@
kombu - Messaging library for Python
========================================
-:Version: 3.0.16
+:Version: 3.1.0a1
`Kombu` is a messaging library for Python.
@@ -82,33 +82,33 @@ and the `Wikipedia article about AMQP`_.
Transport Comparison
====================
-+---------------+----------+------------+------------+---------------+
-| **Client** | **Type** | **Direct** | **Topic** | **Fanout** |
-+---------------+----------+------------+------------+---------------+
-| *amqp* | Native | Yes | Yes | Yes |
-+---------------+----------+------------+------------+---------------+
-| *qpid* | Native | Yes | Yes | Yes |
-+---------------+----------+------------+------------+---------------+
-| *redis* | Virtual | Yes | Yes | Yes (PUB/SUB) |
-+---------------+----------+------------+------------+---------------+
-| *mongodb* | Virtual | Yes | Yes | Yes |
-+---------------+----------+------------+------------+---------------+
-| *beanstalk* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *SQS* | Virtual | Yes | Yes [#f1]_ | Yes [#f2]_ |
-+---------------+----------+------------+------------+---------------+
-| *couchdb* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *zookeeper* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *in-memory* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *django* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *sqlalchemy* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *SLMQ* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
++---------------+----------+------------+------------+---------------+--------------+
+| **Client** | **Type** | **Direct** | **Topic** | **Fanout** | **Priority** |
++---------------+----------+------------+------------+---------------+--------------+
+| *amqp* | Native | Yes | Yes | Yes | Yes [#f3]_ |
++---------------+----------+------------+------------+---------------+--------------+
+| *qpid* | Native | Yes | Yes | Yes | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *redis* | Virtual | Yes | Yes | Yes (PUB/SUB) | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *mongodb* | Virtual | Yes | Yes | Yes | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *beanstalk* | Virtual | Yes | Yes [#f1]_ | No | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *SQS* | Virtual | Yes | Yes [#f1]_ | Yes [#f2]_ | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *couchdb* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *zookeeper* | Virtual | Yes | Yes [#f1]_ | No | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *in-memory* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *django* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *sqlalchemy* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *SLMQ* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
.. [#f1] Declarations only kept in memory, so exchanges/queues
@@ -118,6 +118,7 @@ Transport Comparison
Disabled by default, but can be enabled by using the
``supports_fanout`` transport option.
+.. [#f3] AMQP Message priority support depends on broker implementation.
Documentation
-------------