[midPoint-git] [Evolveum/midpoint] 0e4aee: three way delta, more tests, removed obsolete code

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0e4aee37c171a6706de84ebf36e452986f566319
      https://github.com/Evolveum/midpoint/commit/0e4aee37c171a6706de84ebf36e452986f566319
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDeltaValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDeltaValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMergeOperation.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/FragmentSide.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/MergeFragment.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/MergeResult.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/SingleModification.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/ThreeWayMerger.java
    R infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/AssertMergeFragment.java
    R infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/ThreeWayMergerTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java
    A infra/schema/src/test/resources/delta/role-base.xml
    A infra/schema/src/test/resources/delta/role-left.xml
    A infra/schema/src/test/resources/delta/role-right.xml
    R infra/schema/src/test/resources/merger/3way/role-base.xml
    R infra/schema/src/test/resources/merger/3way/role-left.xml
    R infra/schema/src/test/resources/merger/3way/role-right.xml
    M infra/schema/testng-unit.xml
    M repo/system-init/src/test/java/com/evolveum/midpoint/init/TestInitialObjects.java

  Log Message:
  -----------
  three way delta, more tests, removed obsolete code


  Commit: 73700f0269b05405687a7eb1150e3d3265140e90
      https://github.com/Evolveum/midpoint/commit/73700f0269b05405687a7eb1150e3d3265140e90
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

  Changed paths:
    A docs/diag/troubleshooting/troubleshooting-task-performance.adoc

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/b0ecc7d54263...73700f0269b0

To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications