Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 3d2d9bfd4f091d05aff0689c5a9d468f395c9d3e https://github.com/hibernate/hibernate-orm/commit/3d2d9bfd4f091d05aff0689... Author: Benjamin Tegarden <ben(a)arbitrage.hk&gt; Date: 2014-01-20 (Mon, 20 Jan 2014) Changed paths: M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java Log Message: ----------- HHH-8404: Correctly render 'ListIndexExpression' Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/ListIndexExpression.java Commit: 2059edd2961fd244c273f4c08c6387251d570974 https://github.com/hibernate/hibernate-orm/commit/2059edd2961fd244c273f4c... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2014-01-20 (Mon, 20 Jan 2014) Changed paths: M hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Address.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/ListIndexTest.java Log Message: ----------- HHH-8404 test case Conflicts: hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Address.java Compare: https://github.com/hibernate/hibernate-orm/compare/c574fe0b1797...2059edd...