mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: e40878 | patch | commitdiff
Chris Ridd
01.19.2013 8ca747546ddda3f83a3d4b7ccefefb345d713950
refs
author Chris Ridd <chris.ridd@forgerock.com>
Wednesday, May 1, 2013 10:19 +0200
committer Chris Ridd <chris.ridd@forgerock.com>
Wednesday, May 1, 2013 10:19 +0200
commit8ca747546ddda3f83a3d4b7ccefefb345d713950
tree faae3f2662814cc26cd08a6623d19cc2a1b6ba05 tree | zip | gz
parent e408784ed8f189a26e1161ba1f9590d066039c54 view | diff 
Back out commits 8812-8814

The main commit (8812) breaks these functional tests:

replication.conflict.double_mod_del_add_multi_1
replication.conflict.double_mod_del_add_multi_2
replication.conflict.double_mod_add_multi
replication.conflict.double_mod_del_multi
replication.conflict.mod_replace_vs_mod_del_multi
6 files modified
146 ■■■■■ changed files
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistorical.java 7 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalMultiple.java 77 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java 30 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/EntryHistorical.java 5 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java 18 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java 9 ●●●●● diff | view | raw | blame | history