diff options
| author | Micael Karlberg <[email protected]> | 2011-05-12 14:16:36 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-05-12 14:16:36 +0200 |
| commit | 266e6fda05c1682f975050cd4a1d72d49a03ea7d (patch) | |
| tree | e684bb65fe15d96b17bcac27808c3cb8ec2e1335 /lib/ssl/src/ssl.appup.src | |
| parent | 9f1bd481611ad0ad9e4913b66adde474dafafa98 (diff) | |
| parent | 30919cea3c641148389a46e94af20805e55f684c (diff) | |
| download | otp-266e6fda05c1682f975050cd4a1d72d49a03ea7d.tar.gz otp-266e6fda05c1682f975050cd4a1d72d49a03ea7d.tar.bz2 otp-266e6fda05c1682f975050cd4a1d72d49a03ea7d.zip | |
Merge branch 'bmk/catching_gen_tcp_badargs/OTP-9289' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/ssl/src/ssl.appup.src')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index d3e426f254..cf8867245b 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,17 +1,19 @@ %% -*- erlang -*- {"%VSN%", [ + {"4.1.4", [{restart_application, ssl}]}, {"4.1.3", [{restart_application, ssl}]}, {"4.1.2", [{restart_application, ssl}]}, {"4.1.1", [{restart_application, ssl}]}, - {"4.1", [{restart_application, ssl}]}, + {"4.1", [{restart_application, ssl}]}, {"4.0.1", [{restart_application, ssl}]} ], [ + {"4.1.4", [{restart_application, ssl}]}, {"4.1.3", [{restart_application, ssl}]}, {"4.1.2", [{restart_application, ssl}]}, {"4.1.1", [{restart_application, ssl}]}, - {"4.1", [{restart_application, ssl}]}, + {"4.1", [{restart_application, ssl}]}, {"4.0.1", [{restart_application, ssl}]} ]}. |