[midPoint-git] [Evolveum/midpoint] 6f9e7f: MID-2269 fix

[erik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6f9e7f3ba40bfbf7267fed2012e7b37d41075b5b
      https://github.com/Evolveum/midpoint/commit/6f9e7f3ba40bfbf7267fed2012e7b37d41075b5b
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  MID-2269 fix


  Commit: e93f132cb944bfe831b6fc4dc3dcce9a9d19c494
      https://github.com/Evolveum/midpoint/commit/e93f132cb944bfe831b6fc4dc3dcce9a9d19c494
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A samples/tasks/task-user-recompute-selected-users-only.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/e9e8944aa17d...e93f132cb944