summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-10-29 11:44:54 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-10-29 11:44:54 +0000
commit1709e715558913d8b91347076ceb598ebe3ef6a2 (patch)
tree045af3907dcf38e62e89f03f0dd07ffda5085bf3
parentdc37e725f535861f6d98e7b9c4592978aae57a04 (diff)
parent1fe7da7e0cf7a626f11b0ec519ec8dacff710acb (diff)
downloadrabbitmq-server-git-1709e715558913d8b91347076ceb598ebe3ef6a2.tar.gz
stable to default
-rw-r--r--.hgignore1
-rw-r--r--ebin/rabbit_app.in4
2 files changed, 3 insertions, 2 deletions
diff --git a/.hgignore b/.hgignore
index cd017298ba..05850b030e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
*.swp
*.patch
*.orig
+*.tmp
erl_crash.dump
deps.mk
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 6ee0115b67..a10bad450d 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -1,4 +1,4 @@
-{application, rabbit, %% -*- erlang -*-
+{application, rabbit, %% -*- erlang -*-
[{description, "RabbitMQ"},
{id, "RabbitMQ"},
{vsn, "%%VSN%%"},
@@ -25,7 +25,7 @@
%% 0 ("no limit") would make a better default, but that
%% breaks the QPid Java client
{frame_max, 131072},
- {heartbeat, 600},
+ {heartbeat, 580},
{msg_store_file_size_limit, 16777216},
{queue_index_max_journal_entries, 65536},
{default_user, <<"guest">>},