Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: ccc83405c46ff24ba9698f9dc675ce4bb024b1b3 https://github.com/hibernate/hibernate-orm/commit/ccc83405c46ff24ba9698f9... Author: rvansa <rvansa(a)redhat.com&gt; Date: 2015-05-27 (Wed, 27 May 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java M hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/ReadOnlyExtraAPITestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java Log Message: ----------- HHH-9695 Use non-transactional cache for immutable entities Commit: 6417a469f9c82174d37dcbde0169659b11a21f26 https://github.com/hibernate/hibernate-orm/commit/6417a469f9c82174d37dcbd... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2015-05-27 (Wed, 27 May 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/Caches.java Log Message: ----------- HHH-9695 - Fix merge conflicts and checkStyle failure Compare: https://github.com/hibernate/hibernate-orm/compare/4e2f7aeae40f...6417a46...