[midPoint-git] [Evolveum/midpoint] 224488: test fix attempt

[kate]

  Branch: refs/heads/post-3.7-fixes
  Home:   https://github.com/Evolveum/midpoint
  Commit: 22448879df9fc19cdb56bd0b30c3006dc9e28b65
      https://github.com/Evolveum/midpoint/commit/22448879df9fc19cdb56bd0b30c3006dc9e28b65
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties

  Log Message:
  -----------
  test fix attempt


  Commit: c2200cd7fdb93f6d3f7624020f534b0a509ed688
      https://github.com/Evolveum/midpoint/commit/c2200cd7fdb93f6d3f7624020f534b0a509ed688
  Author: kate <honchar at evolveum.com>
  Date:   2018-02-01 (Thu, 01 Feb 2018)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/resource-white-after.xml
    A infra/schema/src/test/resources/diff/resource-white-before.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml

  Log Message:
  -----------
  Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint into post-3.7-fixes


Compare: https://github.com/Evolveum/midpoint/compare/7475e6daa94b...c2200cd7fdb9