summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-07-20 12:46:47 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-07-20 12:46:47 +0100
commit3b93007137e1a5d2259ca954bfbc77d81f622d26 (patch)
treeed6e1bb1d68072c2404b1d3f94176a40df904b2c /docs
parent4ff838e74360176024305c2101f4fc6b1c09e50b (diff)
parent89d63aa6763a95e85c5afb8b587c693871fe3afb (diff)
downloadrabbitmq-server-git-3b93007137e1a5d2259ca954bfbc77d81f622d26.tar.gz
Merged default into bug 22889
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.xml40
1 files changed, 33 insertions, 7 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 9280b95c15..a7d064f1e7 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -270,8 +270,8 @@
<title>Cluster management</title>
<variablelist>
- <varlistentry>
- <term><cmdsynopsis><command>cluster</command> <arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term>
+ <varlistentry id="cluster">
+ <term><cmdsynopsis><command>cluster</command><arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term>
<listitem>
<variablelist>
<varlistentry>
@@ -281,7 +281,8 @@
</variablelist>
<para>
Instruct the node to become member of a cluster with the
- specified nodes.
+ specified nodes. To cluster with currently offline nodes,
+ use <link linkend="force_cluster"><command>force_cluster</command></link>.
</para>
<para>
Cluster nodes can be of two types: disk or ram. Disk nodes
@@ -334,6 +335,29 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry id="force_cluster">
+ <term><cmdsynopsis><command>force_cluster</command><arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term>
+ <listitem>
+ <variablelist>
+ <varlistentry>
+ <term>clusternode</term>
+ <listitem><para>Subset of the nodes of the cluster to which this node should be connected.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ Instruct the node to become member of a cluster with the
+ specified nodes. This will succeed even if the specified nodes
+ are offline. For a more detailed description, see
+ <link linkend="cluster"><command>cluster</command>.</link>
+ </para>
+ <para>
+ Note that this variant of the cluster command just
+ ignores the current status of the specified nodes.
+ Clustering may still fail for a variety of other
+ reasons.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect2>
@@ -603,10 +627,12 @@
<para role="example-prefix">For example:</para>
<screen role="example">rabbitmqctl list_permissions -p /myvhost</screen>
<para role="example">
- This command instructs the RabbitMQ broker to list all the
- users which have been granted access to the virtual host
- called <command>/myvhost</command>, and the permissions they
- have for operations on resources in that virtual host.
+ This command instructs the RabbitMQ broker to list all
+ the users which have been granted access to the virtual
+ host called <command>/myvhost</command>, and the
+ permissions they have for operations on resources in
+ that virtual host. Note that an empty string means no
+ permissions granted.
</para>
</listitem>
</varlistentry>