[midPoint-git] [Evolveum/midpoint] 64bf0b: fixing MID-3456

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 64bf0b219179673e484422e0ed83b9c46cce7061
      https://github.com/Evolveum/midpoint/commit/64bf0b219179673e484422e0ed83b9c46cce7061
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  fixing MID-3456


  Commit: 9fb678888708466c45b99f750aee3442137bf208
      https://github.com/Evolveum/midpoint/commit/9fb678888708466c45b99f750aee3442137bf208
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/7bbdbafa0233...9fb678888708