[midPoint-git] [Evolveum/midpoint] f89ed2: fixing tests..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f89ed2842eb44751078ba3671da95fac8b810993
      https://github.com/Evolveum/midpoint/commit/f89ed2842eb44751078ba3671da95fac8b810993
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M testing/story/testng.xml

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


  Commit: 67a98ce7ad6f7d2311eaf3db0981bbeec896868d
      https://github.com/Evolveum/midpoint/commit/67a98ce7ad6f7d2311eaf3db0981bbeec896868d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

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


Compare: https://github.com/Evolveum/midpoint/compare/3a589952edc0...67a98ce7ad6f