[midPoint-git] [Evolveum/midpoint] d8011a: fix Conflicting modification in delta exceptions w...

[mederly]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: d8011a7be6de45389a8b9bf4b58caf70d43ce288
      https://github.com/Evolveum/midpoint/commit/d8011a7be6de45389a8b9bf4b58caf70d43ce288
  Author: Arnost Starosta <arnost.starosta at gmail.com>
  Date:   2018-11-02 (Fri, 02 Nov 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java

  Log Message:
  -----------
  fix Conflicting modification in delta exceptions when delta has no modifications in conflict


  Commit: 943041d1364703914e4640ce309402674a90f79b
      https://github.com/Evolveum/midpoint/commit/943041d1364703914e4640ce309402674a90f79b
  Author: mederly <mederly at evolveum.com>
  Date:   2018-11-14 (Wed, 14 Nov 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java

  Log Message:
  -----------
  Merge pull request #87 from arnost-starosta/support-3.7

fix Conflicting modification in delta exceptions


Compare: https://github.com/Evolveum/midpoint/compare/f0bedc764178...943041d13647
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.