summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-07-01 18:42:01 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-07-01 18:42:01 +0100
commitca3992bbc1d847dba45f5d7101b4a90181efabd0 (patch)
tree52b4910c74983c0883235b819ed0c55a9d7c9a57
parent5a2e7eb43740de2d0e30efda7f263a137493e818 (diff)
downloadrabbitmq-server-git-ca3992bbc1d847dba45f5d7101b4a90181efabd0.tar.gz
remove 'transactional' flag from 'rabbitmqctl list_channel'
-rw-r--r--docs/rabbitmqctl.1.xml4
-rw-r--r--src/rabbit_control.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index e733792f42..717645220e 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1238,8 +1238,8 @@
</varlistentry>
</variablelist>
<para>
- If no <command>channelinfoitem</command>s are specified then pid,
- user, transactional, consumer_count, and
+ If no <command>channelinfoitem</command>s are specified
+ then pid, user, consumer_count, and
messages_unacknowledged are assumed.
</para>
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 9eef384a24..6eb1aaba9a 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -301,7 +301,7 @@ action(list_connections, Node, Args, _Opts, Inform) ->
action(list_channels, Node, Args, _Opts, Inform) ->
Inform("Listing channels", []),
- ArgAtoms = default_if_empty(Args, [pid, user, transactional, consumer_count,
+ ArgAtoms = default_if_empty(Args, [pid, user, consumer_count,
messages_unacknowledged]),
display_info_list(rpc_call(Node, rabbit_channel, info_all, [ArgAtoms]),
ArgAtoms);