Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: 8b45dc0e0b0eadb7955fde53ec6ffffc9ba77c81 https://github.com/hibernate/hibernate-core/commit/8b45dc0e0b0eadb7955fde... Author: Adam Warski <adam(a)warski.org&gt; Date: 2011-10-18 (Tue, 18 Oct 2011) Changed paths: M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotNullAuditExpression.java M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NullAuditExpression.java M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RelatedAuditExpression.java M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/SimpleAuditExpression.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/Activity.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/ActivityId.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java Log Message: ----------- Merge pull request #186 from skowronm/backport_3.6_HHH-6177 Backport HHH-6177 to 3.6