[midPoint-git] [Evolveum/midpoint] 810f59: Fixing replace delta merge bug (MID-3028)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 810f59408e3df55ffb6765ecd773acd181e05d1c
      https://github.com/Evolveum/midpoint/commit/810f59408e3df55ffb6765ecd773acd181e05d1c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/common/role-captain.xml
    M model/model-intest/src/test/resources/common/role-thief.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing replace delta merge bug (MID-3028)