[midPoint-git] [Evolveum/midpoint] f486b2: Object merge, step 3: expressions (MID-3460)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f486b2b7a1e89bbe763aa86a1daffe51fa333b64
      https://github.com/Evolveum/midpoint/commit/f486b2b7a1e89bbe763aa86a1daffe51fa333b64
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.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
    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/TestMerge.java
    M model/model-intest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Object merge, step 3: expressions (MID-3460)