[midPoint-git] [Evolveum/midpoint] 3c29e8: MID-2734 is fixed

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3c29e8e5c10afa7bff18fe45470a35ab93a9246e
      https://github.com/Evolveum/midpoint/commit/3c29e8e5c10afa7bff18fe45470a35ab93a9246e
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java

  Log Message:
  -----------
  MID-2734 is fixed


  Commit: 868aaf9710f8d89da5763da7d27ff52e28a5fa62
      https://github.com/Evolveum/midpoint/commit/868aaf9710f8d89da5763da7d27ff52e28a5fa62
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/resources/logback-test.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.java
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/0ca5e134da07...868aaf9710f8