[midPoint-git] [Evolveum/midpoint] 034c26: fixing MID-3994 & MID-3848 preview changes

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 034c26c439bc8db4df773ba71e539a14eac67bbd
      https://github.com/Evolveum/midpoint/commit/034c26c439bc8db4df773ba71e539a14eac67bbd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3994  & MID-3848 preview changes


  Commit: de087083287a773cbe8c3754cf8b41086781ffbe
      https://github.com/Evolveum/midpoint/commit/de087083287a773cbe8c3754cf8b41086781ffbe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    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/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    A samples/objects/lookup-languages-all.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/295f51a350ac...de087083287a