[midPoint-git] [Evolveum/midpoint] 60a0c8: fixing long tests

[Katarina Valalikova]

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

  Changed paths:
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml

  Log Message:
  -----------
  fixing long tests


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java

  Log Message:
  -----------
  minor code cleanup


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/workflow-impl/src/test/resources/policy/user-lead1.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/longtest/src/test/resources/logback-test.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/resources/strings/users/cheese.xml
    M testing/story/src/test/resources/strings/users/chef.xml
    M testing/story/src/test/resources/strings/users/elaine.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/158629d6c751...9633aa63c586