git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cea603)
Update high availability/replication documentation chart for new hot
Mon, 8 Feb 2010 13:41:06 +0000 (13:41 +0000)
Mon, 8 Feb 2010 13:41:06 +0000 (13:41 +0000)
standby featureset.


diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 6591dae193e6351cc8363b20364a76697cdb9b7a..0e8351ed634057602f3664e4dbf1ff220365622c 100644 (file)
--- 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.38 2010年02月05日 23:53:22 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.39 2010年02月08日 13:41:06 momjian Exp $ -->
<chapter id="high-availability">
<title>High Availability, Load Balancing, and Replication</title>
@@ -283,7 +283,7 @@ protocol to make nodes agree on a serializable transactional order.
<entry>Feature</entry>
<entry>Shared Disk Failover</entry>
<entry>File System Replication</entry>
- <entry>Warm Standby Using PITR</entry>
+ <entry>Hot/Warm Standby Using PITR</entry>
<entry>Trigger-Based Master-Slave Replication</entry>
<entry>Statement-Based Replication Middleware</entry>
<entry>Asynchronous Multimaster Replication</entry>
@@ -374,7 +374,7 @@ protocol to make nodes agree on a serializable transactional order.
<entry>Slaves accept read-only queries</entry>
<entry align="center"></entry>
<entry align="center"></entry>
- <entry align="center"></entry>
+ <entry align="center">Hot only</entry>
<entry align="center">&bull;</entry>
<entry align="center">&bull;</entry>
<entry align="center">&bull;</entry>
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /