Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 1ed895a3737c211e8c895b0297f801daccfe85a9 https://github.com/hibernate/hibernate-orm/commit/1ed895a3737c211e8c895b0... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M hibernate-core/src/main/antlr/hql.g M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlParser.java M hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java A hibernate-core/src/test/java/org/hibernate/test/hql/ParameterTest.java Log Message: ----------- HHH-9154 - keywords as parameter names (cherry picked from commit 5aff092e2bd06bcfc18eb6eec9983b2f97237d64) Conflicts: hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java