From 1afbb2969f0f5bb254f2c777f57803635be23a9e Mon Sep 17 00:00:00 2001 From: gbellato <gbellato@localhost> Date: Mon, 11 Jun 2007 10:08:13 +0000 Subject: [PATCH] Final part for issue 604 : replication needs to resolve naming conflicts --- opendj-sdk/opends/resource/schema/02-config.ldif | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif index 21bb051..dd453eb 100644 --- a/opendj-sdk/opends/resource/schema/02-config.ldif +++ b/opendj-sdk/opends/resource/schema/02-config.ldif @@ -1276,6 +1276,9 @@ NAME 'ds-cfg-file-size-limit' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' ) +attributeTypes: ( 1.3.6.1.4.1.26027.1.1.380 NAME 'ds-sync-conflict' + 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 STRUCTURAL MUST ( cn $ ds-cfg-acl-handler-class $ ds-cfg-acl-handler-enabled ) -- Gitblit v1.10.0