[midPoint-git] [Evolveum/midpoint] 3e5868: Support for multiple merge configurations (MID-346...

[Radovan Semancik]

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

  Changed paths:
    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-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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:
  -----------
  Support for multiple merge configurations (MID-3460)