Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: ebca36a76851c9b0b7ea406e1b1428225891de2f https://github.com/hibernate/hibernate-orm/commit/ebca36a76851c9b0b7ea406... Author: Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; Date: 2018-06-20 (Wed, 20 Jun 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java M hibernate-core/src/test/java/org/hibernate/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java Log Message: ----------- HHH-12654 - Throw MappingException if both @Inheritance and @AttributeOverride are used **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.