Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: 98e3b2ab975cbded82949ece0c17e486797025dc https://github.com/hibernate/hibernate-orm/commit/98e3b2ab975cbded82949ec... Author: Vincent Cornet <vincent.cornet(a)gmail.com&gt; Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/ClobTypeDescriptor.java Log Message: ----------- HHH-7889 Conflicts: hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/ClobTypeDescriptor.java Commit: bbfd960bc896344e8bfbca8e5a7697aa73a606aa https://github.com/hibernate/hibernate-orm/commit/bbfd960bc896344e8bfbca8... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobTypeDescriptor.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/BlobTypeDescriptor.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/ClobTypeDescriptor.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NClobTypeDescriptor.java Log Message: ----------- HHH-7889 Cleanup inconsistencies in Blob, Clob, and NClob type descriptors Compare: https://github.com/hibernate/hibernate-orm/compare/9069d7aed9fc...bbfd960...