aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2008-11-17 18:55:14 +0000
committerBruce Momjian <bruce@momjian.us>2008-11-17 18:55:14 +0000
commit29ad832dba35445a3f904cd934c581f94f75fcd5 (patch)
tree92cbe43bd667e962a3ebbd3b73727f1049787cb6
parent25ca5a9a54923a5d6746f771c4c23e85a195bde5 (diff)
downloadpostgresql-29ad832dba35445a3f904cd934c581f94f75fcd5.tar.gz
postgresql-29ad832dba35445a3f904cd934c581f94f75fcd5.zip
Document that Bucardo is an example of mulit-master replication with
conflict resolution.
-rw-r--r--doc/src/sgml/high-availability.sgml3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 4d1abbccf09..51e4c72e8f8 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.32 2008/01/30 10:49:55 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.33 2008/11/17 18:55:14 momjian Exp $ -->
<chapter id="high-availability">
<title>High Availability, Load Balancing, and Replication</title>
@@ -212,6 +212,7 @@ protocol to make nodes agree on a serializable transactional order.
server works independently, and periodically communicates with
the other servers to identify conflicting transactions. The
conflicts can be resolved by users or conflict resolution rules.
+ Bucardo is an example of this type of replication.
</para>
</listitem>
</varlistentry>