aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-28 15:43:54 +0200
committerIngela Anderton Andin <[email protected]>2011-06-28 15:44:00 +0200
commit4c6c6e297e4e73ba99b882cdc622a8a439dafeda (patch)
tree44e8e46544c0d312580b1cc12e9842e3683d0cb7
parent80afe2b50aa5479e1e53dd7ba01e540df6351781 (diff)
parent7d72600b7a3f9b74f399a4d333ce8b6db8e819ab (diff)
downloadotp-4c6c6e297e4e73ba99b882cdc622a8a439dafeda.tar.gz
otp-4c6c6e297e4e73ba99b882cdc622a8a439dafeda.tar.bz2
otp-4c6c6e297e4e73ba99b882cdc622a8a439dafeda.zip
OTP-8493
Merge branch 'ia/odbc/prepare-for-release' into dev * ia/odbc/prepare-for-release: Prepare for release
-rw-r--r--lib/odbc/src/odbc.appup.src6
-rw-r--r--lib/odbc/vsn.mk2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index 2a6667ccd3..f3a3af8c29 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1,8 +1,10 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"2.10.9", [{restart_application, ssl}]}
+ {"2.10.10", [{restart_application, odbc}]},
+ {"2.10.9", [{restart_application, odbc}]}
],
[
- {"2.10.9", [{restart_application, ssl}]}
+ {"2.10.10", [{restart_application, odbc}]},
+ {"2.10.9", [{restart_application, odbc}]}
]}.
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 42a51be33e..120ed9ee3d 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.10.10
+ODBC_VSN = 2.10.11