mirror of
https://github.com/hibernate/hibernate-orm
synced 2025-03-06 09:49:53 +00:00
Conflicts: hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java