summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-01-09 00:07:00 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2014-01-09 00:07:00 +0000
commit3c6b988542c3e1abebf4128eb528a43e3955bc7c (patch)
tree958e466c934bbe1452d0d5d5021b06f58d21491f /ebin
parent1bec9a9b613e2a8f9d83a2429e6f6de44c306976 (diff)
parent042b68a966e22ece0cf117b61488916864079bd2 (diff)
downloadrabbitmq-server-git-3c6b988542c3e1abebf4128eb528a43e3955bc7c.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},