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
commit2ba43b47431249ef7d5ec79941bbc1a7c5ca050c (patch)
tree0b6262b97b180409e61feebe15a970a0accabcb5 /ebin
parent9e8ce2d52f79f8cfdc11120eee45e83f2eb7d8e8 (diff)
parentefba058a32c682fdb29012d987405c246cb9ed07 (diff)
downloadrabbitmq-server-git-2ba43b47431249ef7d5ec79941bbc1a7c5ca050c.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 f4d4ec3d35..ad961a44f9 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, []}},