aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-02 12:22:09 +0100
committerIngela Anderton Andin <[email protected]>2010-12-02 12:22:09 +0100
commit13338198802371d70ca40686d2998861b45edcc4 (patch)
tree58c7ccab81a539a0e47cc7ed8504760661bd891a
parentef489eff777d7da5f965f49c2f0ed71d42173825 (diff)
parent4266892a3bd7fea770edf0b79d359e178162e1cd (diff)
downloadotp-13338198802371d70ca40686d2998861b45edcc4.tar.gz
otp-13338198802371d70ca40686d2998861b45edcc4.tar.bz2
otp-13338198802371d70ca40686d2998861b45edcc4.zip
Merge branch 'ia/odbc/app-upp/odbc-2.10.9' into dev
* ia/odbc/app-upp/odbc-2.10.9: Prepare for release
-rw-r--r--lib/odbc/src/odbc.appup.src9
-rw-r--r--lib/odbc/vsn.mk2
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index e95e542ff5..f1a370d925 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1 +1,8 @@
-{"%VSN%", [],[]}
+%% -*- erlang -*-
+{"%VSN%",
+ [
+ {"2.10.8", [{restart_application, ssl}]}
+ ],
+ [
+ {"2.10.8", [{restart_application, ssl}]}
+ ]}.
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index fac3f06d4b..aacf3924db 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.10.8
+ODBC_VSN = 2.10.9