summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-12-23 23:24:29 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-12-23 23:24:29 +0000
commitd8049e9d5b93d513ea458a8720425d63744bf07d (patch)
treed61951dcf19ee2cc5736bde0bb61de1180651510 /ebin
parenta69954357bdfec1367de17c201757e90e0c62d60 (diff)
parent914f214e95f93f44063f3590fea636b873e8050b (diff)
downloadrabbitmq-server-git-d8049e9d5b93d513ea458a8720425d63744bf07d.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},