[midPoint-git] [Evolveum/midpoint] 2e1d2e: (kindof) fixing TestSecurity (MID-3221)

[Radovan Semancik]

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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  (kindof) fixing TestSecurity (MID-3221)


  Commit: dd69cb980b616e3804d3c4c6bb95d6a4c8bcfa2b
      https://github.com/Evolveum/midpoint/commit/dd69cb980b616e3804d3c4c6bb95d6a4c8bcfa2b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

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


Compare: https://github.com/Evolveum/midpoint/compare/cd7fef1f882b...dd69cb980b61