diff options
| author | Hans Nilsson <[email protected]> | 2017-12-15 12:36:00 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-15 12:36:00 +0100 |
| commit | 056488f7d978efcbd70d6c23cde32ef6f2dc5f49 (patch) | |
| tree | 961d47103721f2f839e97693352526c1f1837251 /lib/ssh/vsn.mk | |
| parent | 5ad63d8a404db14edbb221565baf518728b71426 (diff) | |
| parent | ffc5d16de3350e754a4d4da2be42d29b821233e1 (diff) | |
| download | otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.tar.gz otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.tar.bz2 otp-056488f7d978efcbd70d6c23cde32ef6f2dc5f49.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Special treatment of OpenSSH clients >= 7.2 rsa-sha2-* public keys
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 668d2358c0..004db6e3a2 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.3 +SSH_VSN = 4.6.4 APP_VSN = "ssh-$(SSH_VSN)" |