[midPoint-git] [Evolveum/midpoint] 91e0f7: Fix of fix of logging/profiling config.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 91e0f701052eb6fe04c5d0a718f43eabd45ae9c6
      https://github.com/Evolveum/midpoint/commit/91e0f701052eb6fe04c5d0a718f43eabd45ae9c6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java

  Log Message:
  -----------
  Fix of fix of logging/profiling config.


  Commit: ab9da95598d501ff888d390250b05340f3af5a7a
      https://github.com/Evolveum/midpoint/commit/ab9da95598d501ff888d390250b05340f3af5a7a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointXmlProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M samples/resources/openldap/example.ldif

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java


Compare: https://github.com/Evolveum/midpoint/compare/a9cd7c230ca6...ab9da95598d5