[midPoint-git] [Evolveum/midpoint] 6698bb: relation = org:manager changed to manager to test ...

[Katarina Valalikova]

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

  Changed paths:
    M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml

  Log Message:
  -----------
  relation = org:manager changed to manager to test MID-3660


  Commit: ae46083b6a96e6247d5379f675a51af170240442
      https://github.com/Evolveum/midpoint/commit/ae46083b6a96e6247d5379f675a51af170240442
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  fixing https://jira.evolveum.com/browse/MID-3077


  Commit: 1ca3028bf940c5d602e45f19f75778caa6ec958d
      https://github.com/Evolveum/midpoint/commit/1ca3028bf940c5d602e45f19f75778caa6ec958d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectTypeContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java

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


Compare: https://github.com/Evolveum/midpoint/compare/916fde13cc10...1ca3028bf940