[midPoint-git] [Evolveum/midpoint] 7287b6: fixing village tests..

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7287b6692ff3d7971342cf5d54ccc74253e67e68
      https://github.com/Evolveum/midpoint/commit/7287b6692ff3d7971342cf5d54ccc74253e67e68
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/common/user-administrator.xml
    A testing/story/src/test/resources/common/user-mike.xml
    A testing/story/src/test/resources/village/global-password-policy.xml
    A testing/story/src/test/resources/village/org-password-policy.xml
    M testing/story/src/test/resources/village/resource-dummy-source.xml

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


  Commit: 1eedc112cd70d3eb75f4678214e38986a39a098d
      https://github.com/Evolveum/midpoint/commit/1eedc112cd70d3eb75f4678214e38986a39a098d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M repo/task-quartz-impl/.gitignore
    M samples/samples-test/.gitignore
    A testing/rest/.gitignore
    A testing/story/.gitignore

  Log Message:
  -----------
  adding test-output folder to gitignore..


  Commit: 4c00c3fef2c2cdf655bc97c989fca9082cb4f960
      https://github.com/Evolveum/midpoint/commit/4c00c3fef2c2cdf655bc97c989fca9082cb4f960
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-27 (Tue, 27 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java

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


Compare: https://github.com/Evolveum/midpoint/compare/98e1f3002173...4c00c3fef2c2