diff options
| author | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
| commit | c219fb35d73ad393d983fd8b47a127d03cbc41c5 (patch) | |
| tree | e6f81aec5308dfceefdc6d920434928f38c41981 /lib/ssh/vsn.mk | |
| parent | 0f727bd7b72b009eac169c2e9ef925d3c2ffa409 (diff) | |
| parent | 24c67e110e2219c269454566126ad0885ee57bdc (diff) | |
| download | otp-c219fb35d73ad393d983fd8b47a127d03cbc41c5.tar.gz otp-c219fb35d73ad393d983fd8b47a127d03cbc41c5.tar.bz2 otp-c219fb35d73ad393d983fd8b47a127d03cbc41c5.zip | |
Merge branch 'nick/ssh/crash_report/OTP-8881' into maint-r13
* nick/ssh/crash_report/OTP-8881:
In some cases a crash report was generated when a connection was closing down. This was caused by a race condition between two processes.
Diffstat (limited to 'lib/ssh/vsn.mk')
| -rw-r--r-- | lib/ssh/vsn.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 8e31851a8e..cf90e3b11e 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,9 +1,12 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 1.1.11 +SSH_VSN = 1.1.12 APP_VSN = "ssh-$(SSH_VSN)" -TICKETS = OTP-8735 +TICKETS = OTP-8807 \ + OTP-8881 + +TICKETS_1.1.11 = OTP-8735 TICKETS_1.1.10 = OTP-8714 |