summaryrefslogtreecommitdiff
path: root/docs/rabbitmqctl.1.pod
diff options
context:
space:
mode:
authorBen Hood <0x6e6562@gmail.com>2009-01-21 13:00:07 +0000
committerBen Hood <0x6e6562@gmail.com>2009-01-21 13:00:07 +0000
commit679373c232c358a2d337e443399a22c5441835db (patch)
tree516a796e2614d537271255d855fc12623dc2f8a2 /docs/rabbitmqctl.1.pod
parent7875ef690f84f2e422c3c3e5b6cfc0e35bda02d3 (diff)
parente1fb7f0e3d89c8431ba5520dff48fe939c072a1c (diff)
downloadrabbitmq-server-git-679373c232c358a2d337e443399a22c5441835db.tar.gz
Merged v1_5_1 into default
Diffstat (limited to 'docs/rabbitmqctl.1.pod')
-rw-r--r--docs/rabbitmqctl.1.pod14
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index 692c4dc540..fd8918cd9b 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -146,8 +146,8 @@ 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 messages ready to be delivered to clients
@@ -157,6 +157,12 @@ messages_unacknowledged
messages_uncommitted
number of messages published in as yet uncommitted transactions
+<<<<<<< local
+=======
+
+messages
+ sum of ready, unacknowledged and uncommitted messages
+>>>>>>> other
acks_uncommitted
number of acknowledgements received in as yet uncommitted
@@ -212,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