[midPoint-git] [Evolveum/midpoint] c37cac: Fixing association reconciliation (MID-2470)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c37cac60a1d73bb179d793e53a30d20dc70423a2
      https://github.com/Evolveum/midpoint/commit/c37cac60a1d73bb179d793e53a30d20dc70423a2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/entitlements/role-swashbuckler.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml

  Log Message:
  -----------
  Fixing association reconciliation (MID-2470)


  Commit: c9809842995c021436078b8479da8a19567d52dc
      https://github.com/Evolveum/midpoint/commit/c9809842995c021436078b8479da8a19567d52dc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-07-29 (Wed, 29 Jul 2015)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/iteration/resource-dummy-pink.xml
    A model/model-intest/src/test/resources/preview/resource-dummy-yellow.xml
    A model/model-intest/src/test/resources/preview/user-rogers.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


Compare: https://github.com/Evolveum/midpoint/compare/51e2b56b15f2...c9809842995c