diff options
| author | Hans Nilsson <[email protected]> | 2017-11-20 12:08:42 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-11-20 12:08:42 +0100 |
| commit | bab7b1aba04209c90d15be7147cc3524ae6964f5 (patch) | |
| tree | 4d9c7ac92c0bf65a9498d8255d4879e75e2fda2f /erts/vsn.mk | |
| parent | f91898fc08c28195dd2e9cbfb15bfd91a5584550 (diff) | |
| parent | f021a71ad8ffd2d1f5548927944d2b08935511d1 (diff) | |
| download | otp-bab7b1aba04209c90d15be7147cc3524ae6964f5.tar.gz otp-bab7b1aba04209c90d15be7147cc3524ae6964f5.tar.bz2 otp-bab7b1aba04209c90d15be7147cc3524ae6964f5.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
ssh: testcases for space trailing Hello msg
ssh: Don't remove trailing WS in Hello msg
ssh: dialyzer fixes
ssh: Fix broken error handling during session setup
Remove invalid EINTR loop around close(2)
Conflicts:
lib/ssh/test/ssh_options_SUITE.erl
Diffstat (limited to 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 220c3b5f6c..8cb891e384 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.1.4 +VSN = 9.1.5 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |