From 018234e6ccd27c399d0d1aa17981c8b4f7abbc39 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 07 Jun 2010 09:55:29 +0000
Subject: [PATCH] Fix issue #3404. Conflicting entries are now indexed by ds-sync-conflict attribute. This index is only updated when conflicts are detected and searched on for all deletes and modDN operations. Tested successfully against performance regression.

---
 opends/src/messages/messages/replication.properties |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/opends/src/messages/messages/replication.properties b/opends/src/messages/messages/replication.properties
index 25e4416..0189c92 100644
--- a/opends/src/messages/messages/replication.properties
+++ b/opends/src/messages/messages/replication.properties
@@ -494,4 +494,6 @@
 NOTICE_ERR_WHILE_TRYING_TO_DECODE_RUV_IN_STATE_200=Error while trying to \
  translate RUV into state for suffix %s
 SEVERE_ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN_201=Processing two different \
- changes with same changeNumber=%s. Previous msg=<%s>, New msg=<%s>
\ No newline at end of file
+ changes with same changeNumber=%s. Previous msg=<%s>, New msg=<%s>
+SEVERE_ERR_COULD_NOT_SOLVE_CONFLICT_202=Error while trying to solve conflict \
+ with DN : %s ERROR : %s

--
Gitblit v1.10.0