Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 66670208087dee2def3e54d4e30c77fe21b74ef4 https://github.com/hibernate/hibernate-orm/commit/66670208087dee2def3e54d... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2016-06-07 (Tue, 07 Jun 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategyCreator.java M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java M hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java M hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java A hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java A hibernate-core/src/test/java/org/hibernate/test/cache/SharedRegionTest.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegion.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/CollectionRegionImpl.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/EntityRegionImpl.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java M hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java Log Message: ----------- HHH-10287 - Cache keys no longer include the entity type (cherry picked from commit 3a0824a03754eefa630e38f1a32ae2c2c0ef5c0d) Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java Commit: 81ffaacf0989c392e3e12b7cc87faede103262ec https://github.com/hibernate/hibernate-orm/commit/81ffaacf0989c392e3e12b7... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-06-07 (Tue, 07 Jun 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java M hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java M hibernate-core/src/main/java/org/hibernate/cache/internal/StrategyCreatorRegionFactoryImpl.java M hibernate-core/src/test/java/org/hibernate/test/cache/SharedRegionTest.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java Log Message: ----------- HHH-10287 - Made necessary changes to backport Compare: https://github.com/hibernate/hibernate-orm/compare/1f14ec555cbe...81ffaac...