summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorEssien Ita Essien <essiene@gmail.com>2008-12-26 10:29:00 +0100
committerEssien Ita Essien <essiene@gmail.com>2008-12-26 10:29:00 +0100
commita625e7695d9af4083a137821e52bd3afa09c85c2 (patch)
tree11f0aaae33fa1335f1b986f76757b6733d64fe91 /ebin
parent9e4fdee06474001eecfd58cce1ceea7e49fde9b3 (diff)
parent4be2257979970f5b697d1e4402ca0bd6bd3ae691 (diff)
downloadrabbitmq-server-git-a625e7695d9af4083a137821e52bd3afa09c85c2.tar.gz
Merge in upstream changes
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit.app14
1 files changed, 10 insertions, 4 deletions
diff --git a/ebin/rabbit.app b/ebin/rabbit.app
index 0326f461b8..70a1320855 100644
--- a/ebin/rabbit.app
+++ b/ebin/rabbit.app
@@ -2,9 +2,9 @@
[{description, "RabbitMQ"},
{id, "RabbitMQ"},
{vsn, "%%VERSION%%"},
- {modules, [rabbit,
- buffering_proxy,
+ {modules, [buffering_proxy,
rabbit_access_control,
+ rabbit_alarm,
rabbit_amqqueue,
rabbit_amqqueue_process,
rabbit_amqqueue_sup,
@@ -12,20 +12,25 @@
rabbit_binary_parser,
rabbit_channel,
rabbit_control,
+ rabbit,
rabbit_error_logger,
+ rabbit_error_logger_file_h,
rabbit_exchange,
- rabbit_framing,
rabbit_framing_channel,
+ rabbit_framing,
rabbit_heartbeat,
rabbit_load,
rabbit_log,
+ rabbit_memsup_linux,
rabbit_misc,
rabbit_mnesia,
+ rabbit_multi,
rabbit_networking,
rabbit_node_monitor,
rabbit_persister,
rabbit_reader,
rabbit_router,
+ rabbit_sasl_report_file_h,
rabbit_sup,
rabbit_tests,
rabbit_tracer,
@@ -48,4 +53,5 @@
{extra_startup_steps, []},
{default_user, <<"guest">>},
{default_pass, <<"guest">>},
- {default_vhost, <<"/">>}]}]}.
+ {default_vhost, <<"/">>},
+ {memory_alarms, false}]}]}.