summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-08-01 15:59:47 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-08-01 15:59:47 +0100
commitd39b2bb892ac9b4f92e27c9aa1ccb11276ec35fa (patch)
tree79688178fb289e88a08dc948964e9d7dc23453a6 /ebin
parent03084f29639c7889b6c4d03c4290a9e66f81eb29 (diff)
parente62a381d53e320cb4778cfac94be18f38fb51c8f (diff)
downloadrabbitmq-server-git-d39b2bb892ac9b4f92e27c9aa1ccb11276ec35fa.tar.gz
merge 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 65308f8ee3..7884228169 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},
+ {heartbeat, 600},
{msg_store_file_size_limit, 16777216},
{queue_index_max_journal_entries, 262144},
{default_user, <<"guest">>},