[midPoint-git] [Evolveum/midpoint] 019830: three way delta processing conflicting/non-conflic...

[Tadeas Chrapovic]

  Branch: refs/heads/feature/role-mining
  Home:   https://github.com/Evolveum/midpoint
  Commit: 01983082c9aed5f0b648cafbd9359b043d9b9f9d
      https://github.com/Evolveum/midpoint/commit/01983082c9aed5f0b648cafbd9359b043d9b9f9d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-05-20 (Mon, 20 May 2024)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/Conflict.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDeltaValue.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/Direction.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDelta.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/ThreeWayMerge.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/TreeDeltaUtils.java

  Log Message:
  -----------
  three way delta processing conflicting/non-conflicting modifications, wip


  Commit: 725cefa1a0ac7a731ee4915eb855482e880ab538
      https://github.com/Evolveum/midpoint/commit/725cefa1a0ac7a731ee4915eb855482e880ab538
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-05-20 (Mon, 20 May 2024)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMerge.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java

  Log Message:
  -----------
  three way delta processing compilation fix


  Commit: 78d1fe52a91db77bc888e0612716e8a46b644e3a
      https://github.com/Evolveum/midpoint/commit/78d1fe52a91db77bc888e0612716e8a46b644e3a
  Author: KaterynaHonchar <honchar at evolveum.com>
  Date:   2024-05-20 (Mon, 20 May 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java

  Log Message:
  -----------
  fix for 9671 Bulk Approval on My work items - Out Of Memory


  Commit: 2a490e6a273c770a8a3561dd2905bfeef756c66a
      https://github.com/Evolveum/midpoint/commit/2a490e6a273c770a8a3561dd2905bfeef756c66a
  Author: KaterynaHonchar <honchar at evolveum.com>
  Date:   2024-05-20 (Mon, 20 May 2024)

  Changed paths:
    M gui/admin-gui/src/frontend/scss/midpoint.scss

  Log Message:
  -----------
  style fix


  Commit: d2b155ceb764251cd799828c27db6e78d979c614
      https://github.com/Evolveum/midpoint/commit/d2b155ceb764251cd799828c27db6e78d979c614
  Author: KaterynaHonchar <honchar at evolveum.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/DetailsTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java

  Log Message:
  -----------
  simulations icon update


  Commit: 70b3376501724806c79c29ae16b0d530101acb52
      https://github.com/Evolveum/midpoint/commit/70b3376501724806c79c29ae16b0d530101acb52
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

  Changed paths:
    M docs/admin-gui/collections-views/configuration/index.adoc
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/system-init/src/main/resources/initial-objects/archetype/029-archetype-application.xml
    M repo/system-init/src/main/resources/initial-objects/role/044-role-privileged-access.xml
    M repo/system-init/src/main/resources/initial-objects/system-configuration/000-system-configuration.xml

  Log Message:
  -----------
  Initial object changes for classifications/clearances (adminGuiConfig) + docs update


  Commit: b453c69bb96683d251f51b22102c6401d347c5ed
      https://github.com/Evolveum/midpoint/commit/b453c69bb96683d251f51b22102c6401d347c5ed
  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
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMerge.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMergeOperation.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java

  Log Message:
  -----------
  three way delta, more tests, code cleanup and few fixes


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

  Changed paths:
    M docs/admin-gui/collections-views/configuration/index.adoc
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/DetailsTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/system-init/src/main/resources/initial-objects/archetype/029-archetype-application.xml
    M repo/system-init/src/main/resources/initial-objects/role/044-role-privileged-access.xml
    M repo/system-init/src/main/resources/initial-objects/system-configuration/000-system-configuration.xml

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


  Commit: 488d4dc3c0cb977faa542210dfdc35f1dfb59e1a
      https://github.com/Evolveum/midpoint/commit/488d4dc3c0cb977faa542210dfdc35f1dfb59e1a
  Author: Slavek Licehammer <slavek at evolveum.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

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

  Log Message:
  -----------
  New docs page for task performance troubleshooting


  Commit: b0ecc7d54263b8dfe5de786672dbc4f59cb25604
      https://github.com/Evolveum/midpoint/commit/b0ecc7d54263b8dfe5de786672dbc4f59cb25604
  Author: Slavek Licehammer <slavek 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 'docs/cleanup-4.8' into master


  Commit: a9c1dd7ff216853ae066fbe113c41b56e7958cce
      https://github.com/Evolveum/midpoint/commit/a9c1dd7ff216853ae066fbe113c41b56e7958cce
  Author: tchrapovic <chrapovic.tadeas at gmail.com>
  Date:   2024-05-21 (Tue, 21 May 2024)

  Changed paths:
    M docs/admin-gui/collections-views/configuration/index.adoc
    A docs/diag/troubleshooting/troubleshooting-task-performance.adoc
    M gui/admin-gui/src/frontend/scss/midpoint.scss
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/DetailsTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/Conflict.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ContainerTreeDeltaValue.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/Direction.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ItemTreeDeltaValue.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMerge.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/ThreeWayMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/delta/TreeDeltaUtils.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TreeDeltaTest.java
    M repo/system-init/src/main/resources/initial-objects/archetype/029-archetype-application.xml
    M repo/system-init/src/main/resources/initial-objects/role/044-role-privileged-access.xml
    M repo/system-init/src/main/resources/initial-objects/system-configuration/000-system-configuration.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/role-mining


Compare: https://github.com/Evolveum/midpoint/compare/85e755253e40...a9c1dd7ff216

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