summaryrefslogtreecommitdiff
path: root/docs/rabbitmq.config.example
diff options
context:
space:
mode:
authorTim Watson <watson.timothy@gmail.com>2014-01-10 17:07:46 +0000
committerTim Watson <watson.timothy@gmail.com>2014-01-10 17:07:46 +0000
commit8c4feedd9c119240cfe1d24977e3183edde657d7 (patch)
tree5ceacfcd59b7a4342ecc219f17c279ef751a8f97 /docs/rabbitmq.config.example
parent8b397e93f589e6c57182b76e941cc02274656885 (diff)
parentd31640186232bdab187deafdf4885aaae685df66 (diff)
downloadrabbitmq-server-git-8c4feedd9c119240cfe1d24977e3183edde657d7.tar.gz
Merge default into bug24926
Merge conflicts in rabbit.erl, pertaining to app startup procedure.
Diffstat (limited to 'docs/rabbitmq.config.example')
-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