Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: c76859709af26065f67a0d062a68b9040ebef90c https://github.com/hibernate/hibernate-orm/commit/c76859709af26065f67a0d0... Author: Lukasz Antoniak <lukasz.antoniak(a)gmail.com&gt; Date: 2013-12-02 (Mon, 02 Dec 2013) Changed paths: A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/Contractor.java A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/Employee.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java Log Message: ----------- HHH-8701 - Fix JPQL TYPE operator test Conflicts: hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java