merge stable into default

2 files changed, 58 insertions, 3 deletions

diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 63540568f1..bc8f6fbf32 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -33,8 +33,8 @@
    %% {handshake_timeout, 10000},
 
    %% Log levels (currently just used for connection logging).
-   %% One of 'info', 'warning', 'error' or 'none', in decreasing order
-   %% of verbosity. Defaults to 'info'.
+   %% One of 'debug', 'info', 'warning', 'error' or 'none', in decreasing
+   %% order of verbosity. Defaults to 'info'.
    %%
    %% {log_levels, [{connection, info}]},
 
@@ -220,6 +220,13 @@
    %%
    %% {cluster_nodes, {['rabbit@my.host.com'], disc}},
 
+   %% Interval (in milliseconds) at which we send keepalive messages
+   %% to other cluster members. Note that this is not the same thing
+   %% as net_ticktime; missed keepalive messages will not cause nodes
+   %% to be considered down.
+   %%
+   %% {cluster_keepalive_interval, 10000},
+
    %% Set (internal) statistics collection granularity.
    %%
    %% {collect_statistics, none},
@@ -235,7 +242,12 @@
    %% Timeout used when waiting for Mnesia tables in a cluster to
    %% become available.
    %%
-   %% {mnesia_table_loading_timeout, 30000}
+   %% {mnesia_table_loading_timeout, 30000},
+
+   %% Size in bytes below which to embed messages in the queue index. See
+   %% http://www.rabbitmq.com/persistence-conf.html
+   %%
+   %% {queue_index_embed_msgs_below, 4096}
 
   ]},
 
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 8e89d7f0de..40d8978e9b 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -426,6 +426,41 @@
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term><cmdsynopsis><command>rename_cluster_node</command> <arg choice="req">oldnode1</arg> <arg choice="req">newnode1</arg> <arg choice="opt">oldnode2</arg> <arg choice="opt">newnode2 ...</arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Supports renaming of cluster nodes in the local database.
+            </para>
+            <para>
+              This subcommand causes rabbitmqctl to temporarily become
+              the node in order to make the change. The local cluster
+              node must therefore be completely stopped; other nodes
+              can be online or offline.
+            </para>
+            <para>
+              This subcommand takes an even number of arguments, in
+              pairs representing the old and new names for nodes. You
+              must specify the old and new names for this node and for
+              any other nodes that are stopped and being renamed at
+              the same time.
+            </para>
+            <para>
+              It is possible to stop all nodes and rename them all
+              simultaneously (in which case old and new names for all
+              nodes must be given to every node) or stop and rename
+              nodes one at a time (in which case each node only needs
+              to be told how its own name is changing).
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl rename_cluster_node rabbit@misshelpful rabbit@cordelia</screen>
+            <para role="example">
+              This command will rename the node
+              <command>rabbit@misshelpful</command> to the node
+              <command>rabbit@cordelia</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
           <term><cmdsynopsis><command>update_cluster_nodes</command> <arg choice="req">clusternode</arg></cmdsynopsis>
           </term>
           <listitem>
@@ -1226,6 +1261,14 @@
                 <listitem><para>Like <command>message_bytes</command> but counting only those messages which are persistent.</para></listitem>
               </varlistentry>
               <varlistentry>
+                <term>disk_reads</term>
+                <listitem><para>Total number of times messages have been read from disk by this queue since it started.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>disk_writes</term>
+                <listitem><para>Total number of times messages have been written to disk by this queue since it started.</para></listitem>
+              </varlistentry>
+              <varlistentry>
                 <term>consumers</term>
                 <listitem><para>Number of consumers.</para></listitem>
               </varlistentry>