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

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: d0bec55590fd199cf5af00c3497f1ff3ed5ace77
      https://github.com/Evolveum/midpoint/commit/d0bec55590fd199cf5af00c3497f1ff3ed5ace77
  Author: Arnost Starosta <arnost.starosta at gmail.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:
  -----------
  fix Conflicting modification in delta exceptions when delta has no modifications in conflict


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

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java

  Log Message:
  -----------
  Re-enable a test in TestDelta after Arnost's fix

TestDelta.testObjectDeltaFindItemDeltaModifyNonExistentPropertyInReplacedContainer
was failing because of a fault that Arnost has recently fixed. So this
test can be re-enabled now. Related to MID-4689.


  Commit: d1e33acc5317a4dee211bd46cc64cb59101fdc73
      https://github.com/Evolveum/midpoint/commit/d1e33acc5317a4dee211bd46cc64cb59101fdc73
  Author: Pavol 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:
  -----------
  Fix a minor fault in findItemValues

Replaced "==" with .equals() when comparing Long objects.


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

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/1bce65a3e746...3a9cf9dbd591
      **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.