[midPoint-git] [Evolveum/midpoint] c338cf: adding merge test for mark

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c338cfd69aace5296a3e7f3303a4ee40a0b84199
      https://github.com/Evolveum/midpoint/commit/c338cfd69aace5296a3e7f3303a4ee40a0b84199
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/TypeSpecificMergersConfigurator.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/MarkMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/object/ObjectMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-result.xml
    A infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-source.xml
    A infra/schema/src/test/resources/merger/mark/mark-focus-deactivated-target.xml
    M infra/schema/src/test/resources/merger/object-collection/object-collection-resource-up-result.xml

  Log Message:
  -----------
  adding merge test for mark


  Commit: 8dae60ccb51b4f275ac072e5545a98875e836dff
      https://github.com/Evolveum/midpoint/commit/8dae60ccb51b4f275ac072e5545a98875e836dff
  Author: lskublik <lskublik at evolveum.com>
  Date:   2023-09-12 (Tue, 12 Sep 2023)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/35aec65efc26...8dae60ccb51b