summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2014-01-23 15:53:52 +0000
committerEmile Joubert <emile@rabbitmq.com>2014-01-23 15:53:52 +0000
commit9d95f9d193706d5ae6ce153a2eda3518cf6e90b9 (patch)
tree0112f03fdad3ca5e5e80267a75601b0b4bd76768 /ebin
parent6cda03580045f384d13271f8088a564714c8a4df (diff)
parentd25db8a1f5eb9df5d4db0e4ea656c3071578149b (diff)
downloadrabbitmq-server-git-9d95f9d193706d5ae6ce153a2eda3518cf6e90b9.tar.gz
Merged stable to 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},