diff options
| author | Hans Nilsson <[email protected]> | 2017-02-03 11:38:02 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-03 11:38:02 +0100 |
| commit | 4208945259f1a32f4261fc603b2f2be9057c5d50 (patch) | |
| tree | 0dcb00848ee6af8364546b4bf9ab23ede97c862e /lib | |
| parent | 24dc54fdb810fa29c13b7bd4d38c8d940b939cdc (diff) | |
| parent | b2f2d1059fda823d3f71086a77adeb99d5475b94 (diff) | |
| download | otp-4208945259f1a32f4261fc603b2f2be9057c5d50.tar.gz otp-4208945259f1a32f4261fc603b2f2be9057c5d50.tar.bz2 otp-4208945259f1a32f4261fc603b2f2be9057c5d50.zip | |
erge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/vsn.mk | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.app.src | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk index 38e2db9033..f4d1c7b4ba 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1,5 @@ +<<<<<<< HEAD CRYPTO_VSN = 3.7.2 +======= +CRYPTO_VSN = 3.6.3.1 +>>>>>>> maint-18 diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 3a31daeb20..d28d4cd766 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,14 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"6.2.4">>, [{load_module, httpd_request_handler, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"6.2.4">>, [{load_module, httpd_request_handler, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 76b7d8cd55..2bb7491b0c 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -48,4 +48,3 @@ "stdlib-3.1" ]}]}. - |