From dd224a594bc446dc3faf6a806d99cf4e42f630d1 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 30 Sep 2011 22:29:19 +0000
Subject: [PATCH] HBASE-4517 Document new replication features in 0.92

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1177867 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/hbase/replication/package.html   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/javadoc/org/apache/hadoop/hbase/replication/package.html b/src/main/javadoc/org/apache/hadoop/hbase/replication/package.html
index c861f65c1b8..d61becb38bd 100644
--- a/src/main/javadoc/org/apache/hadoop/hbase/replication/package.html
+++ b/src/main/javadoc/org/apache/hadoop/hbase/replication/package.html
@@ -44,7 +44,9 @@ for future developments. The current implementation offers the following
 features:
 
 <ol>
-    <li>Master/Slave replication limited to 1 slave cluster. </li>
+    <li>Master/Slave replication.</li>
+    <li>Master/Master replication.</li>
+    <li>Cyclic replication.</li>
     <li>Replication of scoped families in user tables.</li>
     <li>Start/stop replication stream.</li>
     <li>Supports clusters of different sizes.</li>
@@ -74,6 +76,8 @@ Before trying out replication, make sure to review the following requirements:
     <li>Every table that contains families that are scoped for replication
     should exist on every cluster with the exact same name, same for those
     replicated families.</li>
+    <li>For multiple slaves, Master/Master, or cyclic replication version
+    0.92 or greater is needed.</li>
 </ol>
 
 <p>
@@ -113,6 +117,10 @@ to another.
     scope of 1 means it's going to be. In the future, different scope can be
     used for routing policies.
     </li>
+    <li>To list all configured peers run the following command in the master's
+    shell
+    <pre>list_peers</pre> (as of version 0.92)
+    </li>
 </ol>
 
 You can confirm that your setup works by looking at any region server's log