[midPoint-git] [Evolveum/midpoint] 302e33: fixing CryptoUtil.encryptProtectedStringType, same...

[Katarina Valalikova]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: 302e33be4225ae8060ab8785e56ce44ef6ec2838
      https://github.com/Evolveum/midpoint/commit/302e33be4225ae8060ab8785e56ce44ef6ec2838
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java

  Log Message:
  -----------
  fixing CryptoUtil.encryptProtectedStringType, same as (57af3099da8dc0a3d3ba2c6d40a0bbb878ea5a08)


  Commit: 4b8fc615559cd2c578d4edbcd59a683e2e60916a
      https://github.com/Evolveum/midpoint/commit/4b8fc615559cd2c578d4edbcd59a683e2e60916a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializationOptions.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPropagateTaskObjectReferenceTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/de933c49e597...4b8fc615559c