[midPoint-git] [Evolveum/midpoint] f9d77f: pre-merge

[Radovan Semancik]

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

  Changed paths:
    A testing/sanity/src/test/resources/request/user-modify-add-account-legacy.xml

  Log Message:
  -----------
  pre-merge


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

  Changed paths:
    A testing/sanity/src/test/resources/request/user-modify-add-account-legacy.xml

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


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

  Changed paths:
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

  Log Message:
  -----------
  Fixing legacy sanity


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

  Changed paths:
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/opendj-resource-genericsync.xml

  Log Message:
  -----------
  Fixing OpenDJ samples


Compare: https://github.com/Evolveum/midpoint/compare/8539902ea683...3f1f13f10ed3