Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 14053b5928e9a1683825892437f9c6ab4612c41c https://github.com/hibernate/hibernate-orm/commit/14053b5928e9a1683825892... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: A hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/DefaultQueryPlanFactory.java A hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java A hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreterInitiator.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadataRecognizer.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadataRecognizerInitiator.java M hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanFactory.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanFactoryInitiator.java R hibernate-core/src/main/java/org/hibernate/engine/query/spi/SQLParameterMetadataRecognizer.java M hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java Log Message: ----------- HHH-9190 : consolidate contracts (cherry picked from commit fbe72e7b641fba2c95ce0b8867e080fb7e52613d) Conflicts: hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadataRecognizerInitiator.java