diff options
| author | Hans Nilsson <[email protected]> | 2014-02-25 16:07:07 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-02-25 16:07:07 +0100 |
| commit | b73ad34005892d28574e6ddab15e19b537c26f6d (patch) | |
| tree | c0e1361b4f5b3cdf5e6c52058184f1e3b8552cbe | |
| parent | b9440a0529bea5ccc3f4341db29ddda6f4b7c536 (diff) | |
| parent | 5ba204b97bb101e67e5a65728db2f0a9097aa9bc (diff) | |
| download | otp-b73ad34005892d28574e6ddab15e19b537c26f6d.tar.gz otp-b73ad34005892d28574e6ddab15e19b537c26f6d.tar.bz2 otp-b73ad34005892d28574e6ddab15e19b537c26f6d.zip | |
Merge branch 'rel-fixes'
| -rw-r--r-- | lib/eldap/src/eldap.appup.src | 10 | ||||
| -rw-r--r-- | lib/eldap/vsn.mk | 3 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 1 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 8 |
5 files changed, 23 insertions, 9 deletions
diff --git a/lib/eldap/src/eldap.appup.src b/lib/eldap/src/eldap.appup.src index 7a9a5ef548..bed8d783b8 100644 --- a/lib/eldap/src/eldap.appup.src +++ b/lib/eldap/src/eldap.appup.src @@ -16,6 +16,12 @@ %% %% %CopyrightEnd% {"%VSN%", - [{<<".*">>,[{restart_application, eldap}]}], - [{<<".*">>,[{restart_application, eldap}]}] + [ + {"1.0.2", [{load_module, eldap, soft_purge, soft_purge, []}]}, + {<<".*">>,[{restart_application, eldap}]} + ], + [ + {"1.0.2", [{load_module, eldap, soft_purge, soft_purge, []}]}, + {<<".*">>,[{restart_application, eldap}]} + ] }. diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk index dd1f50653c..efdc30b476 100644 --- a/lib/eldap/vsn.mk +++ b/lib/eldap/vsn.mk @@ -1 +1,2 @@ -ELDAP_VSN = 1.0.2 +ELDAP_VSN = 1.0.3 + diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 7a909b2f3f..dd081962cc 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -16,6 +16,12 @@ %% %% %CopyrightEnd% {"%VSN%", - [{<<"5\\..*">>,[{restart_application, inets}]}], - [{<<"5\\..*">>,[{restart_application, inets}]}] + [ + {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]}, + {<<"5\\..*">>,[{restart_application, inets}]} + ], + [ + {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]}, + {<<"5\\..*">>,[{restart_application, inets}]} + ] }. diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index cccfb7a44f..6b1f149cc8 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -21,4 +21,3 @@ APPLICATION = inets INETS_VSN = 5.9.8 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" - diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index df34a5a3ff..9837630597 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,13 +19,15 @@ {"%VSN%", [ + {<<"3\\.0\\..*">>, [{restart_application, ssh}]}, {<<"2\\.1\\..*">>, [{restart_application, ssh}]}, {<<"2\\.0\\..*">>, [{restart_application, ssh}]}, - {<<"1\\..*">>, [{restart_application, ssh}]} + {<<"1\\..*">>, [{restart_application, ssh}]} ], [ - {<<"2\\.1\\..*">>,[{restart_application, ssh}]}, + {<<"3\\.0\\..*">>, [{restart_application, ssh}]}, + {<<"2\\.1\\..*">>, [{restart_application, ssh}]}, {<<"2\\.0\\..*">>, [{restart_application, ssh}]}, - {<<"1\\..*">>, [{restart_application, ssh}]} + {<<"1\\..*">>, [{restart_application, ssh}]} ] }. |