summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBen Hood <0x6e6562@gmail.com>2009-01-21 13:17:21 +0000
committerBen Hood <0x6e6562@gmail.com>2009-01-21 13:17:21 +0000
commitadc88315b04e35123a69bcd30dafa5be70fc8787 (patch)
treedeb0da0c09c9f380e915cdbb596477ab02af4f17 /docs
parent9604a10ae3fc86bc84ffdbbf017d8ad6081e6796 (diff)
parent51b19aaff21998a54870db8ba893ee10a9531779 (diff)
downloadrabbitmq-server-git-adc88315b04e35123a69bcd30dafa5be70fc8787.tar.gz
Merged default into 20097
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.pod20
1 files changed, 12 insertions, 8 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index b9edd5847f..fd8918cd9b 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -146,23 +146,27 @@ auto_delete
arguments
queue arguments
-pid
- Erlang process identifier associated with the queue
+node
+ node on which the process associated with the queue resides
messages_ready
- number of ready messages
+ number of messages ready to be delivered to clients
messages_unacknowledged
- number of unacknowledged messages
+ number of messages delivered to clients but not yet acknowledged
messages_uncommitted
- number of uncommitted messages
+ number of messages published in as yet uncommitted transactions
+<<<<<<< local
+=======
messages
sum of ready, unacknowledged and uncommitted messages
+>>>>>>> other
acks_uncommitted
- number of uncommitted acknowledgements
+ number of acknowledgements received in as yet uncommitted
+ transactions
consumers
number of consumers
@@ -214,8 +218,8 @@ list_connections [I<connectioninfoitem> ...]
=over 4
-pid
- Erlang process id associated with the connection
+node
+ node on which the process associated with the connection resides
address
server IP number