summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-03-25 15:51:12 +0000
committerEmile Joubert <emile@rabbitmq.com>2013-03-25 15:51:12 +0000
commite98b3e1249dbf2247e8ddb7e7948d978a31e7855 (patch)
tree301dcb0c8c52a7ec3c0317ba2b4accb017a16978 /ebin
parentb45d38eb5638ece380b0ae864a85e9a45fa9db34 (diff)
parentbb754c38ec9b0fb562036b39a9762a905158227c (diff)
downloadrabbitmq-server-bug24114.tar.gz
Merged default into bug24114bug24114
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 16dfd196..339fa69e 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -10,7 +10,7 @@
rabbit_sup,
rabbit_tcp_client_sup,
rabbit_direct_client_sup]},
- {applications, [kernel, stdlib, sasl, mnesia, os_mon]},
+ {applications, [kernel, stdlib, sasl, mnesia, os_mon, xmerl]},
%% we also depend on crypto, public_key and ssl but they shouldn't be
%% in here as we don't actually want to start it
{mod, {rabbit, []}},
@@ -27,7 +27,7 @@
{frame_max, 131072},
{heartbeat, 600},
{msg_store_file_size_limit, 16777216},
- {queue_index_max_journal_entries, 262144},
+ {queue_index_max_journal_entries, 65536},
{default_user, <<"guest">>},
{default_pass, <<"guest">>},
{default_user_tags, [administrator]},
@@ -44,6 +44,7 @@
{log_levels, [{connection, info}]},
{ssl_cert_login_from, distinguished_name},
{reverse_dns_lookups, false},
+ {cluster_partition_handling, ignore},
{tcp_listen_options, [binary,
{packet, raw},
{reuseaddr, true},