aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-08-15Merge branch 'maint'Lukas Larsson
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Filter out release candidates from bundle tags
2018-08-15travis: Filter out release candidates from bundle tagsLukas Larsson
2018-08-15lukas/kernel/logger_set_app_lvl/PR-1843/OTP-15146Lukas Larsson
Add logger:set_application_level/2
2018-08-15Merge pull request #1928 from bettio/fix-remove_message_docBjörn Gustavsson
remove_message does not store any pointer to x0
2018-08-14Merge branch 'maint'Ingela Anderton Andin
2018-08-14Merge branch 'ingela/inets/maint-20/status-501/ERIERL-218/OTP-15215' into maintIngela Anderton Andin
2018-08-14remove_message does not store any pointer to x0Davide Bettio
remove_message just remove messages without writing to any register. Compiler is already generating code like: {get_tuple_element,{x,0},1,{x,0}}. remove_message. {jump,{f,6}} That clearly uses x0 for other purposes.
2018-08-14inets: Prepare for releaseIngela Anderton Andin
2018-08-14inets: Use status code 501 when no mod_* handles the requestIngela Anderton Andin
Conflicts: lib/inets/test/httpd_SUITE.erl
2018-08-14Merge branch 'maint'Ingela Anderton Andin
2018-08-14Merge branch 'ingela/ssl/ERL-668/improve-err-msg/OTP-15234' into maintIngela Anderton Andin
* ingela/ssl/ERL-668/improve-err-msg/OTP-15234: ssl: Improve error message
2018-08-14Merge branch 'maint'Ingela Anderton Andin
2018-08-14Merge branch 'ingela/ssl/ERL-686/OTP-15224' into maintIngela Anderton Andin
* ingela/ssl/ERL-686/OTP-15224: ssl: Error handling improvment
2018-08-14Merge branch 'maint'Siri Hansen
2018-08-14Merge branch 'siri/logger/single_line-unwanted-comma/OTP-15228' into maintSiri Hansen
* siri/logger/single_line-unwanted-comma/OTP-15228: [logger] Avoid unwanted commas introduced by formatter's single_line option
2018-08-14Merge pull request #1924 from omh/doc/typo-fixesLukas Larsson
Documentation typo fixes, Thoose -> Those.
2018-08-13Doc typo fixes, Thoose -> Those.Ole Morten Halvorsen
2018-08-13Merge branch 'maint'Dan Gudmundsson
* maint: Fix delete_object and write convergence in transaction. Replace for loop with strchr Fix typos Clean unused wxe_driver callbacks Remove wx c_src compilation warning on Darwin
2018-08-13Merge remote-tracking branch 'upstream/pr/1858' into maintDan Gudmundsson
* upstream/pr/1858: Fix delete_object and write convergence in transaction. OTP-15231
2018-08-13Merge remote-tracking branch 'upstream/pr/1860' into maintDan Gudmundsson
* upstream/pr/1860: Replace for loop with strchr Fix typos Clean unused wxe_driver callbacks Remove wx c_src compilation warning on Darwin OTP-15230
2018-08-13Merge pull request #1836 from kostis/common_test-warningsSiri Hansen
Fix some unmatched_return warnings
2018-08-13[logger] Avoid unwanted commas introduced by formatter's single_line optionSiri Hansen
When printing a map with ~p in a log message, the formatter's single_line option in some cases introduced unwanted commas after '=>', for example: This is now corrected. When single_line==true, width 0 is added to all ~p and ~P control sequences in the format string.
2018-08-13Merge branch 'maint'Hans Nilsson
* maint: ssh: Test group for circular buffer tracing ssh: Circular trace buffer primitives ssh: Make dbg test one group in ssh_dbg_SUITE
2018-08-13Merge branch 'hans/ssh/circ_buffer/OTP-15020' into maintHans Nilsson
* hans/ssh/circ_buffer/OTP-15020: ssh: Test group for circular buffer tracing ssh: Circular trace buffer primitives ssh: Make dbg test one group in ssh_dbg_SUITE
2018-08-13ssh: Test group for circular buffer tracingHans Nilsson
2018-08-13ssh: Circular trace buffer primitivesHans Nilsson
2018-08-13ssh: Make dbg test one group in ssh_dbg_SUITEHans Nilsson
2018-08-13Merge branch 'maint'Björn Gustavsson
* maint: Correct error behavior of is_map_key/2 in guards
2018-08-13Merge pull request #1919 from bjorng/bjorn/compiler/fix-is_map_key/OTP-15227Björn Gustavsson
Correct error behavior of is_map_key/2 in guards
2018-08-13Merge branch 'maint'Hans Nilsson
* maint: crypto: Added tests for rsa opts from PR838 No need X Windows' headers and libraries to build Erlang since v20.0 Fixes ERL-675
2018-08-13Merge branch 'hans/crypto/rsa_opts/ERL-675/PR1899/OTP-15212' into maintHans Nilsson
* hans/crypto/rsa_opts/ERL-675/PR1899/OTP-15212: crypto: Added tests for rsa opts from PR838 Fixes ERL-675
2018-08-13crypto: Added tests for rsa opts from PR838Hans Nilsson
Just testing to use rsa_pkcs1_oaep_padding, rsa_x931_padding and rsa_sslv23_padding to see that it does not core dum
2018-08-13Correct error behavior of is_map_key/2 in guardsBjörn Gustavsson
Consider the following functions: foo() -> bar(not_a_map). bar(M) when not is_map_key(a, M) -> ok; bar(_) -> error. What will `foo/0` return? It depends. If the module is compiled with the default compiler options, the return value will be `ok`. If the module is compiled with the `inline` option, the return value will be `error`. The correct value is `error`, because the call to `is_map_key/2` when the second argument is not a map should fail the entire guard. That is the way other failing guards BIFs are handled. For example: foo() -> bar(not_a_tuple). bar(T) when not element(1, T) -> ok; bar(_) -> error. `foo/0` always returns `error` (whether the code is inlined or not). This bug can be fixed by changing the classification of `is_map_key/2` in the `erl_internal` module. It is now classified as a type test, which is incorrect because type tests should not fail. Reclassifying it as a plain guard BIF corrects the bug. This correction also fixes the internal consistency check failure which was reported in: https://bugs.erlang.org/browse/ERL-699
2018-08-13Merge pull request #1923 from tarabit190/no_need_X_Windows_to_build_ErlangLukas Larsson
No need X Windows' headers and libraries to build Erlang since v20.0
2018-08-13No need X Windows' headers and libraries to build Erlang since v20.0tarabit190
Since OTP-20.0, the gs application has been removed. Please refer to OTP-13703 in the following link http://erlang.org/download/otp_src_20.0-rc1.readme for further info.
2018-08-11Merge branch 'maint'Rickard Green
* maint: Updated OTP version Update release notes Update version numbers
2018-08-11Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Update release notes Update version numbers
2018-08-11Merge branch 'maint'Rickard Green
* maint: Updated OTP version Update release notes Update version numbers syntax_tools: Fix a bug regarding reverting map types.
2018-08-11Merge branch 'maint-19' into maintRickard Green
* maint-19: Updated OTP version Update release notes Update version numbers syntax_tools: Fix a bug regarding reverting map types.
2018-08-10Updated OTP versionOTP-21.0.5Erlang/OTP
2018-08-10Update release notesErlang/OTP
2018-08-10Update version numbersErlang/OTP
2018-08-10Merge branch 'john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673' into ↵Erlang/OTP
maint-21 * john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673: crypto: Fix crash in compute_key(ecdh, ...) on badarg
2018-08-10Merge branch ↵Erlang/OTP
'john/compiler/fix-deterministic-include-paths/OTP-15204/ERL-679' into maint-21 * john/compiler/fix-deterministic-include-paths/OTP-15204/ERL-679: Omit include path debug info for +deterministic builds # Conflicts: # lib/compiler/test/compile_SUITE.erl
2018-08-10Merge branch 'rickard/full-cache-nif-env/OTP-15223/ERL-695' into maint-21Erlang/OTP
* rickard/full-cache-nif-env/OTP-15223/ERL-695: Fix caching of NIF environment when executing dirty # Conflicts: # erts/emulator/beam/erl_nif.c
2018-08-10Merge branch 'dotsimon/ref_ordering_bug/OTP-15225' into maint-21Erlang/OTP
* dotsimon/ref_ordering_bug/OTP-15225: Fixed #Ref ordering bug Test #Ref ordering in lists and ets
2018-08-10Merge branch 'maint'Rickard Green
* maint: Updated OTP version Update release notes Update version numbers crypto: Fix crash in compute_key(ecdh, ...) on badarg Relax add_table_copy restriction Fixed #Ref ordering bug Test #Ref ordering in lists and ets Do NOT disc_load from ram_copies when master_node is set ssl: Make sure that a correct cipher suite is selected ssl: Correct handling of empty server SNI extension
2018-08-10Merge branch 'maint-20' into maintRickard Green
* maint-20: Updated OTP version Update release notes Update version numbers crypto: Fix crash in compute_key(ecdh, ...) on badarg Relax add_table_copy restriction Fixed #Ref ordering bug Test #Ref ordering in lists and ets Do NOT disc_load from ram_copies when master_node is set ssl: Make sure that a correct cipher suite is selected ssl: Correct handling of empty server SNI extension
2018-08-10Merge branch 'maint'Björn Gustavsson
* maint: Fix bug in binary matching