[midPoint-git] [Evolveum/midpoint] 320408: fixing association deltas when tolerant=false

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 32040888806329795b87001fe931126b6903e84a
      https://github.com/Evolveum/midpoint/commit/32040888806329795b87001fe931126b6903e84a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  fixing association deltas when tolerant=false


  Commit: eee840ee950a1aafd7c2ddb8786c9baeccb47cb1
      https://github.com/Evolveum/midpoint/commit/eee840ee950a1aafd7c2ddb8786c9baeccb47cb1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    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/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/Job.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/testng-integration.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/f1df20ac0e8d...eee840ee950a