summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pre-push: Make easier to add new OTP major releasesSverker Eriksson2018-06-291-2/+20
* Merge branch 'maint-20' into maintSverker Eriksson2018-06-295-3/+60
|\
| * Updated OTP versionOTP-20.3.8.2Erlang/OTP2018-06-282-1/+2
| * Prepare releaseErlang/OTP2018-06-288-5/+75
| * Merge branch 'john/erts/fix-process-schedule-after-free/OTP-15067/ERL-573' in...Erlang/OTP2018-06-282-135/+196
| |\
| * \ Merge branch 'sverker/ic/encode-atom-overrun/ERIERL-191/OTP-15160' into maint-20Erlang/OTP2018-06-281-1/+1
| |\ \
| | * | ic: Fix buffer overrun bug in oe_ei_encode_atomSverker Eriksson2018-06-281-1/+1
| * | | Merge branch 'sverker/erl_interface/simultaneous-connect/OTP-15161' into main...Erlang/OTP2018-06-281-3/+6
| |\ \ \
| | * | | erl_interface: Fix simultaneous connection setupSverker Eriksson2018-06-191-3/+6
| | |/ /
| * | | Merge branch 'sverker/kernel/tick-fixes/OTP-15162' into maint-20Erlang/OTP2018-06-281-9/+10
| |\ \ \
| | * | | kernel: Fix tick count bug when pending writesSverker Eriksson2018-06-281-6/+7
| | * | | kernel: Send tick to hidden node even if pending writesSverker Eriksson2018-06-281-3/+3
| | |/ /
* | | | Merge pull request #1842 from gomoripeti/erl_syntaxHans Bolinder2018-06-292-11/+31
|\ \ \ \
| * | | | Support bitstrings as literals in erl_syntaxPéter Gömöri2018-06-282-11/+31
* | | | | Merge pull request #1853 from gomoripeti/fix_type_unary_opHans Bolinder2018-06-291-1/+1
|\ \ \ \ \
| * | | | | Fix typo in erl_parse type unary_op()Péter Gömöri2018-06-281-1/+1
* | | | | | Merge PR-1844 from arcz/ets_count OTP-15163Sverker Eriksson2018-06-285-105/+108
|\ \ \ \ \ \
| * | | | | | Update system_info doc to include ets_countArtur Cygan2018-06-202-85/+88
| * | | | | | Use bif for other ets tables countingArtur Cygan2018-06-202-19/+19
| * | | | | | Use bif for counting ets tables in observer backendArtur Cygan2018-06-201-1/+1
* | | | | | | Merge branch 'sverker/cerl-fixing' into maintSverker Eriksson2018-06-281-17/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | erts: Remove "-pz $PRELOADED" arguments added by cerlSverker Eriksson2018-06-081-6/+2
| * | | | | | erts: Remove dead code in cerl scriptSverker Eriksson2018-06-081-11/+2
* | | | | | | Merge pull request #1848 from christhekeele/patch-1Hans Bolinder2018-06-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing bracket to erlang:spawn_opt/4 priority option docsChristopher Keele2018-06-241-1/+1
* | | | | | | | Merge branch 'hasse/stdlib/fix_erl_anno_usage' into maintHans Bolinder2018-06-283-11/+31
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | stdlib: Add a few uses of erl_annoHans Bolinder2018-06-253-11/+31
| |/ / / / / /
* | | | | | | Update allowed tags in pre-push hook after OTP-21 releaseJohn Högberg2018-06-261-1/+1
* | | | | | | Merge branch 'maint-21' into maintJohn Högberg2018-06-2610-8/+86
|\ \ \ \ \ \ \
| * | | | | | | Updated OTP versionOTP-21.0.1Erlang/OTP2018-06-252-1/+2
| * | | | | | | Prepare releaseErlang/OTP2018-06-254-2/+32
| * | | | | | | Merge branch 'bjorn/compiler/fix-beam_utils/ERL-650/OTP-15150' into maint-21Erlang/OTP2018-06-252-2/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Fix unsafe optimization when running beam_block the second timeBjörn Gustavsson2018-06-252-2/+29
| * | | | | | | | Merge branch 'john/erts/win32-case-insensitive-osenv/OTP-15147/ERL-644' into ...Erlang/OTP2018-06-252-3/+23
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix environment case sensitivity issues on WindowsJohn Högberg2018-06-212-3/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'maint-20' into maintHans Nilsson2018-06-259-22/+78
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Updated OTP versionOTP-20.3.8.1Erlang/OTP2018-06-212-1/+2
| * | | | | | | Prepare releaseErlang/OTP2018-06-216-4/+65
| * | | | | | | Merge branch 'hans/ssh/sftp_ver4_xfer/ERIERL-199/OTP-15149' into maint-20Erlang/OTP2018-06-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | ssh: Fix ssh_xfer decode_ATTR error for Vsn=4Hans Nilsson2018-06-201-1/+1
| * | | | | | | | Merge branch 'hans/ssh/sftp_error_codes/ERIERL-194/OTP-15148' into maint-20Erlang/OTP2018-06-213-7/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ssh: Report the signal name if there is an exit-signal to sftpdHans Nilsson2018-06-211-3/+3
| | * | | | | | | | ssh: Bug fix sftp error codesHans Nilsson2018-06-212-4/+17
| | |/ / / / / / /
| * | | | | | | | Merge branch 'hasse/syntax_tools/fix_map_type/OTP-15098/ERIERL-177' into main...Erlang/OTP2018-06-212-4/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | syntax_tools: Fix a bug regarding reverting map types.Hans Bolinder2018-06-142-4/+24
| | |/ / / / / / /
| * | | | | | | | Merge branch 'hans/ftp/socket_opts/ERIERL-192/OTP-15120' into maint-20Erlang/OTP2018-06-212-52/+83
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'hans/ftp/21socket_opts/ERIERL-192/OTP-15120' into maintHans Nilsson2018-06-252-52/+80
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'hans/ftp/socket_opts/ERIERL-192/OTP-15120' into hans/ftp/21sock...Hans Nilsson2018-06-202-52/+80
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | ftp: Disallow 'packet_size' for low-level optionsHans Nilsson2018-06-192-1/+2
| | * | | | | | | | ftp: Socket optionsHans Nilsson2018-06-182-52/+82
| | |/ / / / / / /