summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-01-10 11:17:42 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2014-01-10 11:17:42 +0000
commitfa264cc579d1ab65d81eba07fe1c9ed24e0f8693 (patch)
treee98f6f2144ddf088470e059836ff9010732930b7 /ebin
parent21f0c4baabb162270791088d07312afaf4b96b5f (diff)
parent8e99b4b64dc22f807b9f09a294642c734afa1fa3 (diff)
downloadrabbitmq-server-git-fa264cc579d1ab65d81eba07fe1c9ed24e0f8693.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},