[midPoint-git] [Evolveum/midpoint] 80407c: merging conflicts for ContextLoader after cherry p...

[Katarina Valalikova]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: 80407c39463c5327f75792ebfb236769b3bf01d0
      https://github.com/Evolveum/midpoint/commit/80407c39463c5327f75792ebfb236769b3bf01d0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java

  Log Message:
  -----------
  merging conflicts for ContextLoader after cherry picking commit e4078b4fb4


  Commit: 4f0aa5fa7101d00eacf0e6cf45aad7d28edded06
      https://github.com/Evolveum/midpoint/commit/4f0aa5fa7101d00eacf0e6cf45aad7d28edded06
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java

  Log Message:
  -----------
  another fix for MID-4765


  Commit: 7a95a3dddfe395af7aed268dfa6d5e9d083d5fd5
      https://github.com/Evolveum/midpoint/commit/7a95a3dddfe395af7aed268dfa6d5e9d083d5fd5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java

  Log Message:
  -----------
  merging conflicts after cherry picking commit c0bc4ff977


  Commit: 5689f3f5027087fe0ae0f9a45181d1000f5a0a35
      https://github.com/Evolveum/midpoint/commit/5689f3f5027087fe0ae0f9a45181d1000f5a0a35
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-03-04 (Mon, 04 Mar 2019)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java

  Log Message:
  -----------
  fixing tests


Compare: https://github.com/Evolveum/midpoint/compare/92deb2ebbfe1...5689f3f50270