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/quicksetup.properties |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 2805dc1..2461119 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -1354,4 +1354,9 @@
  '%s'.
 INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Registration information error.  \
  Error type: '%s'.  Details: %s
- 
\ No newline at end of file
+FATAL_ERR_ADS_MERGE=The registration information of server %s \
+ and server %s could not be merged.  Reasons:%n%s
+FATAL_ERR_ADS_ADMINISTRATOR_MERGE=The following administrators are defined in \
+ server %s but not in server %s:%n%s%nThe merge can only be performed if these \
+ administrators are defined in server %s.  Use the command-line dsframework \
+ to do so.

--
Gitblit v1.10.0