mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 2d8669 | patch | commitdiff
gbellato
11.08.2007 3772cf260e00f36267f19e995349c6b04893213e
refs
author gbellato <gbellato@localhost>
Monday, June 11, 2007 12:08 +0200
committer gbellato <gbellato@localhost>
Monday, June 11, 2007 12:08 +0200
commit3772cf260e00f36267f19e995349c6b04893213e
tree 7324564c3cc96d25b04984f72795ccded151b2e5 tree | zip | gz
parent 2d8669c190018f4662039e9da1dd098d183baa89 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
opends/resource/schema/02-config.ldif 3 ●●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/messages/ReplicationMessages.java 25 ●●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java 458 ●●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/replication/protocol/AddMsg.java 32 ●●●●● diff | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 190 ●●●●● diff | view | raw | blame | history