Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: f7b80fb28c303d44e810ca878e8dc63eceffdd65 https://github.com/hibernate/hibernate-orm/commit/f7b80fb28c303d44e810ca8... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-10-14 (Mon, 14 Oct 2013) Changed paths: M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java Log Message: ----------- HHH-6859 correct AbstractEntityManagerImpl#determineCacheStoreMode Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java