diff options
| author | Hans Nilsson <[email protected]> | 2019-04-12 14:48:23 +0200 | 
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-04-12 14:48:23 +0200 | 
| commit | efcf68b66bf44f038bca06ade787223e4ba896ca (patch) | |
| tree | 25c1a9c75ec521fea21b1dc1a91e5b888e611fd3 /lib/ssh | |
| parent | 5db9ad449acfb72557409df0dee2a1b96031a584 (diff) | |
| parent | be1c449af5afb7b6494b7e2629977fbc024de087 (diff) | |
| download | otp-efcf68b66bf44f038bca06ade787223e4ba896ca.tar.gz otp-efcf68b66bf44f038bca06ade787223e4ba896ca.tar.bz2 otp-efcf68b66bf44f038bca06ade787223e4ba896ca.zip | |
Merge branch 'maint'
* maint:
  Updated OTP version
  Prepare release
# Conflicts:
#	OTP_VERSION
#	make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 25 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 | 
2 files changed, 26 insertions, 1 deletions
| diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 17f14bdea2..72af24d2fa 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,31 @@      <file>notes.xml</file>    </header> +<section><title>Ssh 4.7.5</title> + +    <section><title>Fixed Bugs and Malfunctions</title> +      <list> +        <item> +          <p> +	    The callback <c>ssh_channel:init/1</c> was missing in +	    OTP-21</p> +          <p> +	    Own Id: OTP-15762</p> +        </item> +        <item> +          <p> +	    If a client was connected to an server on an already open +	    socket, the callback <c>fun(PeerName,FingerPrint)</c> in +	    the <c>accept_callback</c> option passed the local name +	    in the argument PeerName instead of the remote name.</p> +          <p> +	    Own Id: OTP-15763</p> +        </item> +      </list> +    </section> + +</section> +  <section><title>Ssh 4.7.4</title>      <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 0f9eee887c..2947f82556 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@  #-*-makefile-*-   ; force emacs to enter makefile-mode -SSH_VSN = 4.7.4 +SSH_VSN = 4.7.5  APP_VSN    = "ssh-$(SSH_VSN)" | 
