summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2013-11-28 14:56:43 +0400
committerMichael Klishin <michael@rabbitmq.com>2013-11-28 14:56:43 +0400
commita047d93c78916776978fc5365f3d81095973424a (patch)
tree16e8a5326c1d9ea64de482f951d8007652a4a52d
parent04988dd32e9aeec7342243bf8ee5d114f4384679 (diff)
parent5edf4f18814da9f3a181fad22df6a1216165513a (diff)
downloadrabbitmq-server-git-a047d93c78916776978fc5365f3d81095973424a.tar.gz
Automated merge with ssh://rabbit-hg.eng.vmware.com/rabbitmq-server
-rw-r--r--docs/rabbitmq.config.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 91402649e1..c0d6cc7067 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -138,6 +138,11 @@
%%
%% {frame_max, 131072},
+ %% Set the max permissible number of channels per connection.
+ %% 0 means "no limit".
+ %%
+ %% {channel_max, 128},
+
%% Customising Socket Options.
%%
%% See (http://www.erlang.org/doc/man/inet.html#setopts-2) for