From 6286028b47778ec3a01a6c99f6c094ef4bc4698f Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 10 Aug 2009 08:29:48 +0000
Subject: [PATCH] Fix for 4169 : Ability to disable generation of historical information and 4170 : Replication should not generate HistoricalCsnOrdering index for replayed operation

---
 opendj-sdk/opends/resource/schema/02-config.ldif |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index a883e0b..cce5b1b 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -2410,6 +2410,12 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   USAGE directoryOperation
   X-ORIGIN 'OpenDS Directory Server' )
+  
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.592
+  NAME 'ds-cfg-solve-conflicts'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  USAGE directoryOperation
+  X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.1
   NAME 'ds-cfg-access-control-handler'
   SUP top
@@ -2969,7 +2975,8 @@
         ds-cfg-group-id $
         ds-cfg-referrals-url $
         ds-cfg-fractional-exclude $
-        ds-cfg-fractional-include)
+        ds-cfg-fractional-include $
+        ds-cfg-solve-conflicts )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.58
   NAME 'ds-cfg-length-based-password-validator'

--
Gitblit v1.10.0