[midPoint-git] [Evolveum/midpoint] 79735c: Fixing MID-2866.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 79735c9135d8aac291a73470341de2bce82e01ff
      https://github.com/Evolveum/midpoint/commit/79735c9135d8aac291a73470341de2bce82e01ff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/EnvironmentalPerformanceInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/MappingsStatisticsKey.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.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:
  -----------
  Fixing MID-2866.


  Commit: db63d58fce546d8d00b7a9c5b3283db3a187084a
      https://github.com/Evolveum/midpoint/commit/db63d58fce546d8d00b7a9c5b3283db3a187084a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    A samples/resources/edirectory/resource-edirectory-nosync.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/9a3128d483ea...db63d58fce54