# HG changeset patch
# User Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
# Date 1501169839 -7200
# Node ID f97c111db06fe3515d410ae84cb4d2c1ef4192d2
# Parent  688cd5675466c3d91f0874fd657eb81aa1562f11
Updated ChangeLog in preparation of new release

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,12 @@
 # ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
-* Thu Mar 30 2017 Sjoerd Mullender <sjoerd@acm.org>
-- Compiled and released new jars: monetdb-jdbc-2.25.jar, monetdb-mcl-1.15.jar
-  and updated jdbcclient.jar
+* Fri Jul 28 2017 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.26.jar and updated jdbcclient.jar
 
-* Thu Mar  9 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
-- Corrected ResultSetMetaData methods getColumnLabel(int), getColomnName(int),
-  getTableName(int) and getSchemaName(int) for names which contain special
-  characters such as a space, a tab, a comma, a double quote, etc.
-  See also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6183
+* Thu Jul 13 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected implementation of PreparedStatement method
+   setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength)
+  for the case the targetSqlType is Types.CLOB.
+  See also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6349
 
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,15 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past monetdb-java ChangeLog entries
 
+* Fri Jul 28 2017 Sjoerd Mullender <sjoerd@acm.org>
+- Compiled and released new jars: monetdb-jdbc-2.26.jar and updated jdbcclient.jar
+
+* Thu Jul 13 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Corrected implementation of PreparedStatement method
+   setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength)
+  for the case the targetSqlType is Types.CLOB.
+  See also: https://www.monetdb.org/bugzilla/show_bug.cgi?id=6349
+
 * Thu Mar 30 2017 Sjoerd Mullender <sjoerd@acm.org>
 - Compiled and released new jars: monetdb-jdbc-2.25.jar, monetdb-mcl-1.15.jar
   and updated jdbcclient.jar