Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: d3b7b9b7174a025a6f7da029e2c2ec8f7b435a86 https://github.com/hibernate/hibernate-orm/commit/d3b7b9b7174a025a6f7da02... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-10-22 (Tue, 22 Oct 2013) Changed paths: M hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java Log Message: ----------- HHH-8633 register synch in OsgiJtaPlatform Conflicts: hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiJtaPlatform.java