[midPoint-git] [Evolveum/midpoint] ef9201: Fixed oid in approval samples.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: ef92012be36b7e75d69fc4588fe2656659d5a730
      https://github.com/Evolveum/midpoint/commit/ef92012be36b7e75d69fc4588fe2656659d5a730
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Fixed oid in approval samples.


  Commit: 6d7649050de53a0b731d38e4ace4d0ba37a185e8
      https://github.com/Evolveum/midpoint/commit/6d7649050de53a0b731d38e4ace4d0ba37a185e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    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

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


Compare: https://github.com/Evolveum/midpoint/compare/f55b513784b9...6d7649050de5