[midPoint-git] [Evolveum/midpoint] 9033ad: Merging of object policy (system config) and arche...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 9033ad8a7f25d227882f8347d8311569098c3e1d
      https://github.com/Evolveum/midpoint/commit/9033ad8a7f25d227882f8347d8311569098c3e1d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-05-06 (Mon, 06 May 2019)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
    M model/model-intest/src/test/resources/archetypes/user-template-archetypes-global.xml

  Log Message:
  -----------
  Merging of object policy (system config) and archetype policy (MID-5277)