Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: f22a8f627bac8f71c851c21ef90b343fcc2e3c0e https://github.com/hibernate/hibernate-orm/commit/f22a8f627bac8f71c851c21... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2013-03-29 (Fri, 29 Mar 2013) Changed paths: M hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerFactorySerializationTest.java Log Message: ----------- HHH-8122 - Scrub known-sensitive settings from EMF.getProperties() (cherry picked from commit bc85168015927f8fc086c812e0e29ab0f328f8c8) Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java