diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-10-25 13:00:09 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-10-25 13:00:09 +0100 |
| commit | 54248e76629b351561d770208036ffbaedf962a6 (patch) | |
| tree | b0cc0604e0434f3a845fd7132505055dbb0c5e80 /ebin | |
| parent | 71044851c7fc988a8cb560fee98f523739705873 (diff) | |
| parent | 964876078c29a04b6dacd6f77e50e533d607ea39 (diff) | |
| download | rabbitmq-server-git-54248e76629b351561d770208036ffbaedf962a6.tar.gz | |
Merged bug25053 into default
Diffstat (limited to 'ebin')
| -rw-r--r-- | ebin/rabbit_app.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 523b54ced1..9b1ff8bdaf 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">>}, @@ -32,7 +33,7 @@ {default_user_tags, [administrator]}, {default_vhost, <<"/">>}, {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}, - {cluster_nodes, []}, + {cluster_nodes, {[], disc}}, {server_properties, []}, {collect_statistics, none}, {collect_statistics_interval, 5000}, |