[midPoint-git] [Evolveum/midpoint] bda5a5: merge conflic on OperationResult

[Katarina Valalikova]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: bda5a5d8b6262ebb68de22ab37da43ef80fc903f
      https://github.com/Evolveum/midpoint/commit/bda5a5d8b6262ebb68de22ab37da43ef80fc903f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java

  Log Message:
  -----------
  merge conflic on OperationResult


  Commit: 88ec992410337cf77d552e8799b84c66aad66f8a
      https://github.com/Evolveum/midpoint/commit/88ec992410337cf77d552e8799b84c66aad66f8a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ObjectValuePolicyEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/logback-test.xml
    A testing/rest/src/test/resources/repo/json/policy-validate-password-history-conflict.json
    M testing/rest/src/test/resources/repo/security-policy.xml
    A testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    A testing/rest/src/test/resources/repo/yaml/policy-validate-password-history-conflict.yml

  Log Message:
  -----------
  implementing MID-4602 and MID-4603 (cherry picked
9aeb9b6f9deb4f7ba60b3d02355a9d9b7f73fb63 [9aeb9b6f9d]
)


  Commit: 6c913a3389650dcbc30c703186bcd7a5b5c6cdfb
      https://github.com/Evolveum/midpoint/commit/6c913a3389650dcbc30c703186bcd7a5b5c6cdfb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/json/policy-validate-password-history-conflict.json
    M testing/rest/src/test/resources/repo/security-policy.xml
    M testing/rest/src/test/resources/repo/value-policy-general.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-password-history-conflict.yml

  Log Message:
  -----------
  implementing MID-4602 and MID-4603, test enhacements (cherry picked
58030c6c5ebcde52683cca8fe4add72c203a5d05 [58030c6c5e]


  Commit: c8c2c9f53948536fb8985d46c30acf01ef947939
      https://github.com/Evolveum/midpoint/commit/c8c2c9f53948536fb8985d46c30acf01ef947939
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml

  Log Message:
  -----------
  small cleanup rest tests


  Commit: 40a5853a03ae6da32deddc6bb8138c7566095295
      https://github.com/Evolveum/midpoint/commit/40a5853a03ae6da32deddc6bb8138c7566095295
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/json/policy-validate-password-history-conflict.json
    M testing/rest/src/test/resources/repo/json/user-darthadder.json
    A testing/rest/src/test/resources/repo/security-policy-no-history.xml
    M testing/rest/src/test/resources/repo/value-policy-general.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-password-history-conflict.xml
    M testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-password-history-conflict.yml
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml

  Log Message:
  -----------
  fixing password validation (REST, MID-4602)


Compare: https://github.com/Evolveum/midpoint/compare/8a246cb11830...40a5853a03ae
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.