From a837c0600e8855892427c493e164147a8f68d6f4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 13 Jul 2009 09:20:24 +0000
Subject: [PATCH] Fix for issue 4106 (dsreplication should allow to merge disjoint replication topologies) dsreplication allows to merge disjoint topologies.  The limitations on the topologies that can be merged are described in the issue report.

---
 opends/src/messages/messages/admin.properties |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opends/src/messages/messages/admin.properties b/opends/src/messages/messages/admin.properties
index 53d63c2..00a9818 100644
--- a/opends/src/messages/messages/admin.properties
+++ b/opends/src/messages/messages/admin.properties
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-#      Copyright 2006-2008 Sun Microsystems, Inc.
+#      Copyright 2006-2009 Sun Microsystems, Inc.
 
 
 
@@ -279,7 +279,7 @@
 SEVERE_ERR_CLASS_LOADER_CANNOT_READ_MANIFEST_FILE_120=An unexpected \
  error occurred while reading the manifest file: %s
 SEVERE_ERR_CLASS_LOADER_CANNOT_LOAD_CLASS_121=An error occurred while \
- attempting to load class "%s": %s 
+ attempting to load class "%s": %s
 SEVERE_ERR_CLASS_LOADER_CANNOT_FIND_GET_INSTANCE_METHOD_122=Unable to \
  to find the getInstance() method in the managed object definition \
  class "%s": %s
@@ -318,4 +318,6 @@
 files are missing: %s
 SEVERE_WARN_ADMIN_SET_PERMISSIONS_FAILED_137=Failed to set permissions \
  on file %s
+FATAL_ERR_ADMIN_MERGING_138=The registry information of the servers could not \
+ be merged
 

--
Gitblit v1.10.0