Changeset: d02940d6dae3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d02940d6dae3
Removed Files:
        clients/odbc/ChangeLog.odbc-tls
Modified Files:
        clients/odbc/ChangeLog
Branch: default
Log Message:

Move ChangeLog entry to the right place


diffs (57 lines):

diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog
--- a/clients/odbc/ChangeLog
+++ b/clients/odbc/ChangeLog
@@ -1,3 +1,24 @@
 # ChangeLog file for odbc
 # This file is updated with Maddlog
 
+* Fri May 24 2024 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>
+- ODBC now supports TLS. It can be configured through the following
+  DSN- or Connection String attributes (canonical name / user friendly name):
+    TLS / Encrypt = ON/OFF
+    CERT / Server Certificate = PATH
+    CERTHASH / Server Certificate Hash = sha256:HEXDIGITS
+    CLIENTKEY / Client Key = PATH
+    CLIENTCERT / Client Certificate = PATH
+    AUTOCOMMIT / Autocommit = ON/OFF
+- Several more connection properties have been made configurable:
+    SCHEMA / Schema = NAME
+    TIMEZONE / Time Zone = Minutes East Of UTC
+    REPLYSIZE / Reply Size = NUMBER
+    LOGFILE / Log File = PATH
+    LOGINTIMEOUT / Login Timeout = MILLISECONDS
+    CONNECTIONTIMEOUT / Connection Timeout = MILLISECONDS
+    SOCK / Unix Socket = PATH (unix only)
+- SQLBrowseConnect adds On/Off suggestions to boolean settings
+  and prioritizes the DATABASE attribute if it notices monetdbd
+  requires one. Apart from that only UID/User and PWD/Password
+  are required, all others have sensible defaults.
diff --git a/clients/odbc/ChangeLog.odbc-tls b/clients/odbc/ChangeLog.odbc-tls
deleted file mode 100644
--- a/clients/odbc/ChangeLog.odbc-tls
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog file for odbc
-# This file is updated with Maddlog
-
-* Fri May 24 2024 Joeri van Ruth <joeri.van.r...@monetdbsolutions.com>
-- ODBC now supports TLS. It can be configured through the following
-  DSN- or Connection String attributes (canonical name / user friendly name):
-    TLS / Encrypt = ON/OFF
-    CERT / Server Certificate = PATH
-    CERTHASH / Server Certificate Hash = sha256:HEXDIGITS
-    CLIENTKEY / Client Key = PATH
-    CLIENTCERT / Client Certificate = PATH
-    AUTOCOMMIT / Autocommit = ON/OFF
-- Several more connection properties have been made configurable:
-    SCHEMA / Schema = NAME
-    TIMEZONE / Time Zone = Minutes East Of UTC
-    REPLYSIZE / Reply Size = NUMBER
-    LOGFILE / Log File = PATH
-    LOGINTIMEOUT / Login Timeout = MILLISECONDS
-    CONNECTIONTIMEOUT / Connection Timeout = MILLISECONDS
-    SOCK / Unix Socket = PATH (unix only)
-- SQLBrowseConnect adds On/Off suggestions to boolean settings
-  and prioritizes the DATABASE attribute if it notices monetdbd
-  requires one. Apart from that only UID/User and PWD/Password
-  are required, all others have sensible defaults.
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to