diff options
| author | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-10-03 10:11:19 +0200 |
| commit | 8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (patch) | |
| tree | b8df1dd71275d77f45e513c84306c86fac6f6627 /erts/preloaded/src | |
| parent | 237d0c7d230534ef99a11d388ebfd0c1e83af548 (diff) | |
| parent | 69292a11cd4b31fd3ff73b44f28d527f2d16f555 (diff) | |
| download | otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.gz otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.tar.bz2 otp-8fb29181bca26c221ca0a3364f71f79d3d3a4db4.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Fix zlib merge snafu
ssh: fix broken printouts
ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 611010550f..3170ab6351 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -692,4 +692,4 @@ enqueue_input_1(Z, IOVec) -> end. enqueue_nif(_Z, _IOVec) -> - erlang:nif_error(undef).
\ No newline at end of file + erlang:nif_error(undef). |