[midPoint-git] [Evolveum/midpoint] 2be9bb: MID-3629 fix (Org tree, display object types of ty...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2be9bb8219589978b122dff331541717ad91aa67
      https://github.com/Evolveum/midpoint/commit/2be9bb8219589978b122dff331541717ad91aa67
  Author: honchar <honchar 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/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  MID-3629 fix (Org tree, display object types of type shadow goes to 500 error page)


  Commit: 7bbdbafa02334363b91e91a6a1051b54716d65ae
      https://github.com/Evolveum/midpoint/commit/7bbdbafa02334363b91e91a6a1051b54716d65ae
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    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/0b72fcf6a74d...7bbdbafa0233