[midPoint-git] [Evolveum/midpoint] d1c61a: fixing TestOpenDJNegative.test150ModifyObject

[honchar]

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

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ConfigurationExceptionHandler.java

  Log Message:
  -----------
  fixing TestOpenDJNegative.test150ModifyObject


  Commit: 492087dd5a34325dd8aeba229b2c55e364ab38cf
      https://github.com/Evolveum/midpoint/commit/492087dd5a34325dd8aeba229b2c55e364ab38cf
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/AceEditorDialog.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/AceEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

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


Compare: https://github.com/Evolveum/midpoint/compare/895a70c0e196...492087dd5a34