[midPoint-git] [Evolveum/midpoint] da97e8: Chimera test was missing

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: da97e8b01601c8da7d760feb7224942987e51e78
      https://github.com/Evolveum/midpoint/commit/da97e8b01601c8da7d760feb7224942987e51e78
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    M testing/conntest/testng-integration.xml

  Log Message:
  -----------
  Chimera test was missing


  Commit: 85d1a0ffcf03145bf449967253bce6eba463e56b
      https://github.com/Evolveum/midpoint/commit/85d1a0ffcf03145bf449967253bce6eba463e56b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-12-08 (Fri, 08 Dec 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NonceAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordAuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityQuestionAuthneticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/1e12d31b5f85...85d1a0ffcf03