[midPoint-git] [Evolveum/midpoint] bc6986: Pre-merge from LDAP branch

[Radovan Semancik]

  Branch: refs/heads/ldap
  Home:   https://github.com/Evolveum/midpoint
  Commit: bc69865f70b3c642a3221f5656def199ec8af359
      https://github.com/Evolveum/midpoint/commit/bc69865f70b3c642a3221f5656def199ec8af359
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    A testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    A testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    A testing/sanity/src/test/resources/request/account-angelika-legacy.xml

  Log Message:
  -----------
  Pre-merge from LDAP branch


  Commit: 26bfbeecdedf107c230cdf678a962e4908dc4ffc
      https://github.com/Evolveum/midpoint/commit/26bfbeecdedf107c230cdf678a962e4908dc4ffc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    A testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    A testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    A testing/sanity/src/test/resources/request/account-angelika-legacy.xml

  Log Message:
  -----------
  Merge branch 'master' into ldap


Compare: https://github.com/Evolveum/midpoint/compare/120b6396c2c2...26bfbeecdedf