Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 26ae36840dbc13946b479f0d521f462fddce22f2 https://github.com/hibernate/hibernate-orm/commit/26ae36840dbc13946b479f0... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java A hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java A hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java Log Message: ----------- HHH-11037 - Add test for issue (cherry picked from commit 3028f5d78787edf88b23e1135e9cc0339ad86316) Commit: 366efe118f9e17201ba8b2e3da5efa1bf9f1d613 https://github.com/hibernate/hibernate-orm/commit/366efe118f9e17201ba8b2e... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java Log Message: ----------- HHH-11037 : Correct jira issue in @TestForIssue (cherry picked from commit 5096982532907cb7fb605efa24798581fabb6180) Commit: 840258a00e2d76d24d0bb8f3da93f81c18257ca5 https://github.com/hibernate/hibernate-orm/commit/840258a00e2d76d24d0bb8f... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java Log Message: ----------- HHH-11037 : Fix tests to be jdk6-compliant Commit: f446b0a35e3c2076439ab85e3002a26a1b030221 https://github.com/hibernate/hibernate-orm/commit/f446b0a35e3c2076439ab85... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2016-08-18 (Thu, 18 Aug 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java Log Message: ----------- HHH-11037 - Same named subtype embeddable properties ignored (cherry picked from commit 62bfbf8bd9ec3c0b71677befb650fe26a5d46008) Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java Compare: https://github.com/hibernate/hibernate-orm/compare/836691b5a7ff...f446b0a...