summaryrefslogtreecommitdiff
path: root/docs/rabbitmq.conf.5.xml
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-05-10 16:39:01 +0100
committerSimon MacMullen <simon@lshift.net>2010-05-10 16:39:01 +0100
commit4e12216ebecd90afc97ddfea31b6f4394e8bbfbd (patch)
treedccaff833b0ba6a39618b4b21a47930aa61fc398 /docs/rabbitmq.conf.5.xml
parent6324169a1041a601712c8dd12a36bfaed56b3cd4 (diff)
parentb57ebc9d104ab2db4b44b874181db1cf21ecd2c2 (diff)
downloadrabbitmq-server-git-4e12216ebecd90afc97ddfea31b6f4394e8bbfbd.tar.gz
Merge up to a8da11d231ff from default to amqp_0_9_1. This causes
testConnectionQueueSameNode to fail due to a race in recovering exclusive queues (bug 22695). We'll need a fix from default, so leaving as is for the time being.
Diffstat (limited to 'docs/rabbitmq.conf.5.xml')
-rw-r--r--docs/rabbitmq.conf.5.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/rabbitmq.conf.5.xml b/docs/rabbitmq.conf.5.xml
index 34f20f9226..31de71649c 100644
--- a/docs/rabbitmq.conf.5.xml
+++ b/docs/rabbitmq.conf.5.xml
@@ -18,7 +18,7 @@
<refname>rabbitmq.conf</refname>
<refpurpose>default settings for RabbitMQ AMQP server</refpurpose>
</refnamediv>
-
+
<refsect1>
<title>Description</title>
<para>