[midPoint-git] [Evolveum/midpoint] 459fce: Object merge: projections (MID-3460)

[Radovan Semancik]

  Branch: refs/heads/support-3.4
  Home:   https://github.com/Evolveum/midpoint
  Commit: 459fce2b1309b3925dfb0db2f4c5c667d6bef4c5
      https://github.com/Evolveum/midpoint/commit/459fce2b1309b3925dfb0db2f4c5c667d6bef4c5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/MergeDeltas.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    A model/model-intest/src/test/resources/common/resource-dummy-cyan.xml
    A model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    A model/model-intest/src/test/resources/common/role-red-sailor.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    R model/model-intest/src/test/resources/sync/role-red-sailor.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Object merge: projections (MID-3460)