aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-05-02system/doc/reference_manual/: fix a typomr c0b
2017-05-02Merge branch 'ingela/ssl/missing-relnote'Ingela Anderton Andin
* ingela/ssl/missing-relnote: ssl: Add missing release note
2017-05-02ssl: Add missing release noteIngela Anderton Andin
2017-05-02Merge branch 'hm/escript-doc'Rickard Green
* hm/escript-doc: Improvements of escript documentation
2017-05-02Merge branch 'maint'Hans Bolinder
* maint: Updated OTP version Prepare release inets: Add missing release note dialyzer: Fix a bug regarding unknown types erl_mseg.c: don't use invalid indices in - > cache_powered_node[] Fix release note for OTP-14290 Conflicts: OTP_VERSION erts/emulator/sys/common/erl_mseg.c erts/vsn.mk lib/dialyzer/src/dialyzer_analysis_callgraph.erl
2017-05-02Merge remote-tracking branch 'origin/hasse/correct_unknown_types'Hans Bolinder
* origin/hasse/correct_unknown_types: hipe: Fix unknown type dialyzer: Fix unknown type
2017-05-02Merge branch 'maint-19' into maintHans Bolinder
* maint-19: Updated OTP version Prepare release inets: Add missing release note dialyzer: Fix a bug regarding unknown types erl_mseg.c: don't use invalid indices in - > cache_powered_node[] Fix release note for OTP-14290
2017-05-02Merge branch 'ingela/ssl/prepare-release'Ingela Anderton Andin
* ingela/ssl/prepare-release: ssl: Prepare for release
2017-05-02Merge branch 'dgud/wx/fixup-batch-break'Dan Gudmundsson
* dgud/wx/fixup-batch-break: Fixup batch break
2017-04-28ssl: Prepare for releaseIngela Anderton Andin
2017-04-28Updated OTP versionOTP-19.3.3Erlang/OTP
2017-04-28Prepare releaseErlang/OTP
2017-04-28Merge branch 'ingela/fix-inets-releasnote' into maint-19Erlang/OTP
* ingela/fix-inets-releasnote: inets: Add missing release note
2017-04-28Merge branch 'hasse/dialyzer/fix_unknown_types/OTP-14368' into maint-19Erlang/OTP
* hasse/dialyzer/fix_unknown_types/OTP-14368: dialyzer: Fix a bug regarding unknown types
2017-04-28Merge branch 'rickard/relnote-fix/OTP-14363' into maint-19Erlang/OTP
* rickard/relnote-fix/OTP-14363: Fix release note for OTP-14290
2017-04-28Merge branch 'mikpe/erts-erl_mseg-bad-cache-indexing/OTP-14360' into maint-19Erlang/OTP
* mikpe/erts-erl_mseg-bad-cache-indexing/OTP-14360: erl_mseg.c: don't use invalid indices in - > cache_powered_node[]
2017-04-28Merge PR-1413/OTP-14385Sverker Eriksson
This is a dummy merge of g-andrade:feature/phash2_nif AGAIN as the commit message of 61e55780e2800e340e8ff16b5414f08373f89ef3 did not include ticket number OTP-14385.
2017-04-28Dummy commitSverker Eriksson
2017-04-28Merge PR1413 from g-andrade/feature/phash2_nifSverker Eriksson
Support hashing terms from NIF code
2017-04-28Merge PR-1431 from richcarl/mseg-debruijn-usageSverker Eriksson
Rename macro and add clarifying comment
2017-04-28Merge branch 'sverker/internal-hash-opt'Sverker Eriksson
2017-04-28Merge branch 'sverker/fix-debug-vm-windows'Sverker Eriksson
2017-04-28Improvements of escript documentationHÃ¥kan Mattsson
2017-04-28Merge branch 'zandra/kernel/nodenames/OTP-13805'Zandra Norman
* zandra/kernel/nodenames/OTP-13805: kernel: Do not allow unicode in nodenames
2017-04-28kernel: Do not allow unicode in nodenamesZandra Norman
Verify that unicode isn't used in a node name and logi an info message if it is. Filter the head part of the name a bit harder to work with epmd.
2017-04-28Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2017-04-28Merge branch 'hans/ssh/draft-ietf-curdle-ssh-ext-info/OTP-14193'Hans Nilsson
2017-04-28Merge branch 'dgud/erts/erlscript_name'Dan Gudmundsson
* dgud/erts/erlscript_name: Rename argv[0] from beam to invoking program name OTP-14381
2017-04-28Merge branch 'ingela/gen_fsm-doc-fix'Ingela Anderton Andin
* ingela/gen_fsm-doc-fix: stdlib: Adhere to DTD
2017-04-28stdlib: Adhere to DTDIngela Anderton Andin
2017-04-28Merge branch 'peppe/common_test/user_css_problem/OTP-14332'Peter Andersson
* peppe/common_test/user_css_problem/OTP-14332: Add details about CSS usage in the User's Guide OTP-14332
2017-04-28Merge branch 'raimo/gen_statem-dev'Raimo Niskanen
OTP-14531 Generic time-outs in gen_statem Conflicts: lib/stdlib/test/erl_internal_SUITE.erl
2017-04-28Merge branch 'ingela/ssl/cacha-default/OTP-14382'Ingela Anderton Andin
* ingela/ssl/cacha-default/OTP-14382: ssl: Cacha is currently not tested enough to be most prefered.
2017-04-28ssl: Cacha is currently not tested enough to be most prefered.Ingela Anderton Andin
2017-04-28Merge branch 'ingela/dtls/mac'Ingela Anderton Andin
* ingela/dtls/mac: ssl: Correct DTLS mac handling
2017-04-28Merge branch 'dgud/wx/pr/1425'Dan Gudmundsson
* dgud/wx/pr/1425: wxe_impl.cpp: pointer comparison fix
2017-04-28Fixup batch breakDan Gudmundsson
Batches was breaked to often, increase the test and break if batch is done (and queue empty).
2017-04-28Merge branch 'dgud/emacs/update-bifs'Lukas Larsson
* dgud/emacs/update-bifs: Update available bifs for 20
2017-04-28Update available bifs for 20Dan Gudmundsson
2017-04-28Merge branch 'hasse/stdlib/fix_qlc_bug/OTP-14296'Hans Bolinder
* hasse/stdlib/fix_qlc_bug/OTP-14296: stdlib: Fix a test in sofs_SUITE debugger: Improve handling of pids, ports, and refs stdlib: Improve handling of pids, ports, and refs in qlc stdlib: Improve the Erlang shell's handling of references
2017-04-28Merge pull request #1433 from johanclaesson/elcDan Gudmundsson
Restore Emacs 25 support
2017-04-27Restore Emacs 25 supportJohan Claesson
Fix loading of byte-compiled erlang.elc on Emacs 25 and the erlang shell.
2017-04-27erts: Optimize make_internal_hash for mapsSverker Eriksson
No need for the xor-trick, to be order independent, as both flatmaps and hashmaps have a constant key-value order internally.
2017-04-27erts: Fix debug emulator on windowsSverker Eriksson
Clear ethr_not_inited__ early (like on unix) to not get assertion in ethr_tsd_key_create("stacklimit")
2017-04-27Merge branch 'zandra/kernel/file_name_SUITE-cuddle'Zandra Norman
* zandra/kernel/file_name_SUITE-cuddle: Kernel: fix file_name_SUITE:icky test case
2017-04-27Merge branch 'rickard/ets-tid-fix/OTP-14094'Rickard Green
* rickard/ets-tid-fix/OTP-14094: Fix typespec of the opaque type tid() of the ETS module
2017-04-27Merge branch 'rickard/ds-stack-size'Rickard Green
OTP-14380 * rickard/ds-stack-size: Suggested stack size options for dirty schedulers
2017-04-27Merge branch 'rickard/debug-timer-fix'Rickard Green
OTP-14356 * rickard/debug-timer-fix: Fix assert in dbg_verify_empty_later_slots()
2017-04-27inets: Add missing release noteIngela Anderton Andin
2017-04-27ssh: Don't expose new rsa-sha2-* as defaultHans Nilsson