diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-04-15 11:37:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-04-15 11:37:00 +0200 |
| commit | 23906a01725f4494b8816c242926d08aeca0ef67 (patch) | |
| tree | 9b1821578103320c1b029000f4f46fece35ea2d4 | |
| parent | 344c8180c2f8197056b384b136520deef9049a1a (diff) | |
| parent | 4440046af48660ecb8d59d6a241c2aea55fc874a (diff) | |
| download | otp-23906a01725f4494b8816c242926d08aeca0ef67.tar.gz otp-23906a01725f4494b8816c242926d08aeca0ef67.tar.bz2 otp-23906a01725f4494b8816c242926d08aeca0ef67.zip | |
Merge branch 'ia/ssl/prepare-for-release' into dev
* ia/ssl/prepare-for-release:
Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index d3e426f254..a0ecb4ac6f 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,7 @@ %% -*- 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}]}, @@ -8,6 +9,7 @@ {"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}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 2f1edfa186..0e80e42637 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 4.1.4 +SSL_VSN = 4.1.5 |