diff options
| author | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
| commit | 41979694d18637c62433a44aaf4a07b2e02e104d (patch) | |
| tree | e3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ssh/vsn.mk | |
| parent | 1540a0758b8d60af7b3832158015bd8cf64016af (diff) | |
| parent | 398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff) | |
| download | otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.gz otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.bz2 otp-41979694d18637c62433a44aaf4a07b2e02e104d.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Add option save_accepted_host
ssh: No error message for signal kill
ssh: Dont repeat supervisor defaults in map fields
ssh: Move starting of channel child to ssh_channel_sup
ssh: Test case for sup tree when shell server proc times out
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/vsn.mk')
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 004db6e3a2..6aaa22a6b4 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.6.4 +SSH_VSN = 4.6.5 APP_VSN = "ssh-$(SSH_VSN)" |