Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 72382b1e08dd64eae9191aada2301e2f76c8ce96 https://github.com/hibernate/hibernate-orm/commit/72382b1e08dd64eae9191aa... Author: Christian Beikov <christian.beikov(a)gmail.com&gt; Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java Log Message: ----------- Test for HHH-10537 Commit: 5d9414257f6687a7238d13da7531d46373a46dac https://github.com/hibernate/hibernate-orm/commit/5d9414257f6687a7238d13d... Author: Christian Beikov <christian.beikov(a)gmail.com&gt; Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java Log Message: ----------- Fix for HHH-10537 Commit: 3f1111ee5c3dcb646df7c1a75f462d51229cab2c https://github.com/hibernate/hibernate-orm/commit/3f1111ee5c3dcb646df7c1a... Author: Chris Cranford <chris(a)hibernate.org&gt; Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java Log Message: ----------- HHH-10537 - Fixed conflict while merging changes from HHH-10557. Compare: https://github.com/hibernate/hibernate-orm/compare/fa3171530c63...3f1111e...