summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-01-08 17:53:57 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2014-01-08 17:53:57 +0000
commit042b68a966e22ece0cf117b61488916864079bd2 (patch)
tree619c861e8ec5691150e253ea9a624a6cf81f7dc0 /ebin
parentf4006a6963c08ec6568f9443e50e6656e3a4cf7b (diff)
parent3d84724655ef0ca56ba07cf5ef9dbcd296ca04e1 (diff)
downloadrabbitmq-server-git-042b68a966e22ece0cf117b61488916864079bd2.tar.gz
merge stable into default
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index f0fee96a93..29f06e7920 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -25,6 +25,7 @@
%% 0 ("no limit") would make a better default, but that
%% breaks the QPid Java client
{frame_max, 131072},
+ {channel_max, 0},
{heartbeat, 580},
{msg_store_file_size_limit, 16777216},
{queue_index_max_journal_entries, 65536},