mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-02-10 05:04:52 +00:00
cfefabcd39
(cherry picked from commit d6fa2b286447e17f926906cf6867e508d6a5b87e) Conflicts: hibernate-core/src/main/java/org/hibernate/engine/spi/NonFlushedChanges.java hibernate-core/src/main/java/org/hibernate/internal/NonFlushedChangesImpl.java hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java