summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-01-08 15:12:21 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-01-08 15:12:21 +0000
commit848b189689e1bc30d4e8b7b7779a0305d3511cac (patch)
treeccdee9000646e3383f5da0023f1a47384e2dfff1
parent711e6f221839103916de2821f6d34e8051bab4ef (diff)
downloadrabbitmq-server-git-848b189689e1bc30d4e8b7b7779a0305d3511cac.tar.gz
Fix docs and specs.
-rw-r--r--docs/rabbitmqctl.1.xml2
-rw-r--r--src/rabbit_amqqueue.erl3
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 31921769df..c7069aedf4 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1162,7 +1162,7 @@
<varlistentry>
<term>status</term>
<listitem><para>The status of the queue. Normally
- 'running', but may be different if the queue is
+ 'running', but may be "{syncing, MsgCount}" if the queue is
synchronising.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 33c2cd62b0..2477b891fc 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -176,8 +176,7 @@
-spec(stop_mirroring/1 :: (pid()) -> 'ok').
-spec(sync_mirrors/1 :: (pid()) ->
'ok' | rabbit_types:error('pending_acks' | 'not_mirrored')).
--spec(cancel_sync_mirrors/1 :: (pid()) ->
- 'ok' | rabbit_types:error('not_mirrored')).
+-spec(cancel_sync_mirrors/1 :: (pid()) -> 'ok' | {'ok', 'not_syncing'}).
-endif.