[midPoint-git] [Evolveum/midpoint] 93d7ea: Fixing "user already exists" exception when re-ite...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 93d7ea936d46ed753ceded5032052ffa422a40d9
      https://github.com/Evolveum/midpoint/commit/93d7ea936d46ed753ceded5032052ffa422a40d9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.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/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensObjectDeltaOperation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    A model/model-intest/src/test/resources/iteration/resource-dummy-fuchsia.xml
    A model/model-intest/src/test/resources/iteration/user-jupiter.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fixing "user already exists" exception when re-iterating an execution wave.


  Commit: 41dc3201f1dca995f75c3747a144a8b050c4ffa4
      https://github.com/Evolveum/midpoint/commit/41dc3201f1dca995f75c3747a144a8b050c4ffa4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: b2627e8614b418b13a5753005326213ace22d64c
      https://github.com/Evolveum/midpoint/commit/b2627e8614b418b13a5753005326213ace22d64c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  Endless clockwork cycling check.


  Commit: 2e630020cd99138298a994334d33521eed5a3175
      https://github.com/Evolveum/midpoint/commit/2e630020cd99138298a994334d33521eed5a3175
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Two tests combining no-shadow conflict with rename operation.


  Commit: 955e247495efdcefefae11685b54f1c69330c4e9
      https://github.com/Evolveum/midpoint/commit/955e247495efdcefefae11685b54f1c69330c4e9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MidpointAspect.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataLog.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/ProfilingTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/LogfileTestTailer.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java

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


Compare: https://github.com/Evolveum/midpoint/compare/b98e4ef11ed9...955e247495ef