[hibernate-commits] [hibernate/hibernate-orm] e469a9: HHH-9216 - Add documentation about merging multipl...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: e469a99c307a1e2b4c4bf30bde85367cc46223f9
      https://github.com/hibernate/hibernate-orm/commit/e469a99c307a1e2b4c4bf30bde85367cc46223f9
  Author: Vlad Mihalcea <mihalcea.vlad at gmail.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
    M documentation/src/main/asciidoc/userguide/chapters/pc/PersistenceContext.adoc
    M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java

  Log Message:
  -----------
  HHH-9216 - Add documentation about merging multiple detached representations of the same entity