[midPoint-git] [Evolveum/midpoint] 13ccbf: Increased timeout for task test 016.

[Pavol Mederly]

  Branch: refs/heads/support-3.5
  Home:   https://github.com/Evolveum/midpoint
  Commit: 13ccbfb6fc36d6ce1cd2fbb049360f5a29e94dcb
      https://github.com/Evolveum/midpoint/commit/13ccbfb6fc36d6ce1cd2fbb049360f5a29e94dcb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java

  Log Message:
  -----------
  Increased timeout for task test 016.

(cherry picked from commit 59a04ec)


  Commit: ac340c4f71a14ef939049da0c3d2205327f4c39f
      https://github.com/Evolveum/midpoint/commit/ac340c4f71a14ef939049da0c3d2205327f4c39f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/DefaultPageParametersEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    A samples/evolveum/evolveum-net.aci
    A samples/evolveum/evolveum-net.ldif
    A samples/evolveum/hr.csv
    A samples/evolveum/midpoint.schema
    A samples/evolveum/object-template-user.xml
    M samples/evolveum/org-users.xml
    M samples/evolveum/posixgroups.ldif
    A samples/evolveum/resource-hr.xml
    M samples/evolveum/resource-openldap.xml
    M samples/evolveum/role-catalog.xml
    M samples/evolveum/roles.xml

  Log Message:
  -----------
  Merge branch 'support-3.5' of https://github.com/Evolveum/midpoint into support-3.5


Compare: https://github.com/Evolveum/midpoint/compare/2092d6d89c06...ac340c4f71a1