[midPoint-git] [Evolveum/midpoint] 5c06d6: fix MID-2620

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5c06d66435259d271895406fbbb515c2797b2e26
      https://github.com/Evolveum/midpoint/commit/5c06d66435259d271895406fbbb515c2797b2e26
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java

  Log Message:
  -----------
  fix MID-2620


  Commit: 1e3382d37e552f4df247047ce49fd22df58fe277
      https://github.com/Evolveum/midpoint/commit/1e3382d37e552f4df247047ce49fd22df58fe277
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/032a2cc308d0...1e3382d37e55