diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-08 10:41:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-03-08 10:41:53 +0100 |
| commit | 98ecac283f87e02e7916a402043a3bd518fc25be (patch) | |
| tree | 2ae34ab1b2f76ef9f8570e381e9509ea550e063f /lib | |
| parent | 70d003ddaecfc290cee565920b89579417c34f9a (diff) | |
| parent | 89545e9243dfa14686f5e881902caf82d9024761 (diff) | |
| download | otp-98ecac283f87e02e7916a402043a3bd518fc25be.tar.gz otp-98ecac283f87e02e7916a402043a3bd518fc25be.tar.bz2 otp-98ecac283f87e02e7916a402043a3bd518fc25be.zip | |
Merge branch 'ingela/ssl/next-maint-version' into maint
* ingela/ssl/next-maint-version:
ssl: Version update
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 18 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 32252386b4..bfdd0c205b 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,11 +1,19 @@ %% -*- erlang -*- {"%VSN%", [ - {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]}, - {<<"^[3-7][.][^.].*">>, [{restart_application, ssl}]} + {<<"8\\..*">>, [{restart_application, ssl}]}, + {<<"7\\..*">>, [{restart_application, ssl}]}, + {<<"6\\..*">>, [{restart_application, ssl}]}, + {<<"5\\..*">>, [{restart_application, ssl}]}, + {<<"4\\..*">>, [{restart_application, ssl}]}, + {<<"3\\..*">>, [{restart_application, ssl}]} ], [ - {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]}, - {<<"^[3-7][.][^.].*">>, [{restart_application, ssl}]} - ] + {<<"8\\..*">>, [{restart_application, ssl}]}, + {<<"7\\..*">>, [{restart_application, ssl}]}, + {<<"6\\..*">>, [{restart_application, ssl}]}, + {<<"5\\..*">>, [{restart_application, ssl}]}, + {<<"4\\..*">>, [{restart_application, ssl}]}, + {<<"3\\..*">>, [{restart_application, ssl}]} + ] }. diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 2cdb825d75..415a47949d 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.1 +SSL_VSN = 8.1.1 |