summaryrefslogtreecommitdiff
path: root/ebin
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-02-08 11:15:09 +0000
committerEmile Joubert <emile@rabbitmq.com>2013-02-08 11:15:09 +0000
commit7fda39b54ccb1bfbf1082d633b10eae4bf2bd954 (patch)
tree0b6262b97b180409e61feebe15a970a0accabcb5 /ebin
parent0dd6aa85db597cd239a261a7f2bc45860f5f810a (diff)
parent77ca2f1fa64f59f4e5c7bc67b214d2ca35cc2498 (diff)
downloadrabbitmq-server-7fda39b54ccb1bfbf1082d633b10eae4bf2bd954.tar.gz
Merge stable into default
Diffstat (limited to 'ebin')
-rw-r--r--ebin/rabbit_app.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index f4d4ec3d..ad961a44 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, []}},