Index: openacs-4/packages/acs-core-docs/www/high-avail.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/high-avail.html,v diff -u -r1.20.2.2 -r1.20.2.3 --- openacs-4/packages/acs-core-docs/www/high-avail.html 12 Dec 2010 00:07:02 -0000 1.20.2.2 +++ openacs-4/packages/acs-core-docs/www/high-avail.html 12 Dec 2010 01:37:24 -0000 1.20.2.3 @@ -1,7 +1,2 @@ -<<<<<<< high-avail.html - -High Availability/High Performance Configurations

High Availability/High Performance Configurations

See also Section , “Running a PostgreSQL database on another server”.

Figure 6.1. Multiple-server configuration

Multiple-server configuration
View comments on this page at openacs.org
-======= -High Availability/High Performance Configurations

High Availability/High Performance Configurations

See also Running a PostgreSQL database on another server.

Figure 6.1. Multiple-server configuration

Multiple-server configuration

View comments on this page at openacs.org
->>>>>>> 1.22 +High Availability/High Performance Configurations

High Availability/High Performance Configurations

See also Running a PostgreSQL database on another server.

Figure 6.1. Multiple-server configuration

Multiple-server configuration

View comments on this page at openacs.org