mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 10e4c2 | patch | commitdiff
gbellato
11.08.2007 1afbb2969f0f5bb254f2c777f57803635be23a9e
refs
author gbellato <gbellato@localhost>
Monday, June 11, 2007 12:08 +0200
committer gbellato <gbellato@localhost>
Monday, June 11, 2007 12:08 +0200
commit1afbb2969f0f5bb254f2c777f57803635be23a9e
tree 26e2cc4dc153ffc8d96cc9aab54ab946ae31996f tree | zip | gz
parent 10e4c24a8945801190fb8ecd73b499fd44533a27 view | diff 
Final part for issue 604 : replication needs to resolve naming conflicts

These changes are the last part of the naming conflict resolution.
It also introduce the ds-sync-conflict attribute that is used to mark the entries for which
an automatic conflict resolution is not possible.
5 files modified
708 ■■■■■ changed files
opendj-sdk/opends/resource/schema/02-config.ldif 3 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/messages/ReplicationMessages.java 25 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java 458 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/AddMsg.java 32 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 190 ●●●●● diff | view | raw | blame | history