Merge branch 'ia/ssl/app-upp/ssl-4.1.1' into dev

* ia/ssl/app-upp/ssl-4.1.1: Prepare for release
etnt · Dec 2, 2010 · b3f18a3 · b3f18a3
2 parents 0099374 + a788808
commit b3f18a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
@@ -1,9 +1,11 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {"4.1", [{restart_application, ssl}]},
   {"4.0.1", [{restart_application, ssl}]}
  ], 
  [
+  {"4.1", [{restart_application, ssl}]},
   {"4.0.1", [{restart_application, ssl}]}
  ]}.
 
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1,2 +1,2 @@
 
-SSL_VSN = 4.1
+SSL_VSN = 4.1.1