diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:41:10 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:41:10 +0100 |
| commit | 50e7caee08df7923a9a0b044660a504d5f6311bc (patch) | |
| tree | e0e791ca688d76eadcd85de7970b745edbd50014 /erts/example | |
| parent | 494724da87d40c1f083be9451e5098ae2fb89759 (diff) | |
| parent | 3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f (diff) | |
| download | otp-50e7caee08df7923a9a0b044660a504d5f6311bc.tar.gz otp-50e7caee08df7923a9a0b044660a504d5f6311bc.tar.bz2 otp-50e7caee08df7923a9a0b044660a504d5f6311bc.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
inets: Prepare for release
inets: Add missing guard
Avoid WindowBits=8 as per the manual
Fix deflateParams on zlib 1.2.11
Ignore empty binaries in enif_inspect_iovec
Emasculate writable binaries on entering an iovec
Only apply EOS behaviors if there's pending data
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/example')
0 files changed, 0 insertions, 0 deletions