aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-09-13Merge branch 'maint'Anders Svensson
2013-09-13Merge branch 'anders/diameter/R16B02_release/OTP-11322' into maintAnders Svensson
* anders/diameter/R16B02_release/OTP-11322: vsn -> 1.4.3 Update appup for diameter-1.4.3 in R16B02
2013-09-13Merge branch 'maint'Björn-Egil Dahlberg
2013-09-13Merge branch 'egil/fix-megaco-appup' into maintBjörn-Egil Dahlberg
* egil/fix-megaco-appup: megaco: Update appup file
2013-09-12vsn -> 1.4.3Anders Svensson
2013-09-12megaco: Update appup fileBjörn-Egil Dahlberg
2013-09-12Update appup for diameter-1.4.3 in R16B02Anders Svensson
2013-09-12Merge branch 'maint'Hans Bolinder
* maint: Correct documentation of predefined types crypto: Add ticket for 5d8a13bb6a180e0a
2013-09-12Merge branch 'hb/erts/refman_corrections/OTP-11321' into maintHans Bolinder
* hb/erts/refman_corrections/OTP-11321: Correct documentation of predefined types
2013-09-12Correct documentation of predefined typesHans Bolinder
The documentation of predefined types has been corrected Thanks to Kostis Sagonas.
2013-09-12crypto: Add ticket for 5d8a13bb6a180e0aSverker Eriksson
OTP-11320
2013-09-12Merge branch 'maint'Peter Andersson
2013-09-12Merge branch 'peppe/common_test/init_stop_problem' into maintPeter Andersson
* peppe/common_test/init_stop_problem: Make builtin hook respond to init:stop OTP-11175
2013-09-11Make builtin hook respond to init:stopPeter Andersson
2013-09-11Merge branch 'maint'Peter Andersson
2013-09-11Merge branch 'peppe/common_test/misc_r16b02_docs' into maintPeter Andersson
* peppe/common_test/misc_r16b02_docs: Add misc documentation OTP-11272 OTP-11263 OTP-11244 OTP-11238 OTP-11176
2013-09-11Add misc documentationPeter Andersson
2013-09-11Merge branch 'maint'Fredrik Gustafsson
2013-09-11Merge branch 'vinoski/sv/fix-sched-stats-disable/OTP-11317' into maintFredrik Gustafsson
* vinoski/sv/fix-sched-stats-disable/OTP-11317: fix system_flag(scheduling_statistics,disable)
2013-09-11Merge branch 'maint'Fredrik Gustafsson
Conflicts: erts/preloaded/ebin/erlang.beam
2013-09-11Merge branch 'jcomellas/jc-integer-to-binary2/OTP-11311' into maintFredrik Gustafsson
* jcomellas/jc-integer-to-binary2/OTP-11311: Update preloaded Fix incorrect values returned by integer_to_binary/2
2013-09-11Merge branch 'maint'Fredrik Gustafsson
2013-09-11Merge branch 'fenollp/parsetools/fix_unicode_leex/OTP-11313' into maintFredrik Gustafsson
* fenollp/parsetools/fix_unicode_leex/OTP-11313: parsetools: added testcase for unicode Missed a few similar calls Fix leex module`s inability to build unicode-aware lexers.
2013-09-10fix system_flag(scheduling_statistics,disable)Steve Vinoski
Clear the "enabled" flag for scheduling statistics when disable is specified.
2013-09-10parsetools: added testcase for unicodeFredrik Gustafsson
2013-09-10Missed a few similar callsPierre Fenoll
2013-09-10Fix leex module`s inability to build unicode-aware lexers.Pierre Fenoll
If you have declared your .xrl file as utf-8 encoded and that some of your definitions contain unicode characters, either leex wouldn`t be able to lex them or compilation of the .xrl file would crash.
2013-09-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-10Merge branch 'ia/prep-release/ssl' into maintIngela Anderton Andin
* ia/prep-release/ssl: ssl: Prepare for release
2013-09-10ssl: Prepare for releaseIngela Anderton Andin
2013-09-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-10Merge branch 'ia/ssl/dtls-refactor/OTP-11292' into maintIngela Anderton Andin
* ia/ssl/dtls-refactor/OTP-11292: ssl: Refactor TLS/DTLS record handling ssl: Dialyzer fixes ssl: Solve rebase issues ssl: DTLS record handling ssl: Add DTLS record primitives ssl: Refactor to provide common handshake functions for TLS/DTLS ssl: Add DTLS handshake primitivs.
2013-09-10ssl: Refactor TLS/DTLS record handlingIngela Anderton Andin
2013-09-10ssl: Dialyzer fixesIngela Anderton Andin
2013-09-10ssl: Solve rebase issuesIngela Anderton Andin
2013-09-10ssl: DTLS record handlingIngela Anderton Andin
Also refactor so that TLS and DTLS can have common functions when possible.
2013-09-10ssl: Add DTLS record primitivesAndreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-10ssl: Refactor to provide common handshake functions for TLS/DTLSIngela Anderton Andin
Common functions will be located in ssl_handshake.erl while specific functions will be located in tls_handshake.erl and dtls_handshake.erl
2013-09-10ssl: Add DTLS handshake primitivs.Andreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-10Update preloadedFredrik Gustafsson
2013-09-10Merge branch 'maint'Hans Bolinder
* maint: Correct documentation of predefined and built-in types
2013-09-10Merge branch 'hb/doc/refman_type_corrections/OTP-11090' into maintHans Bolinder
* hb/doc/refman_type_corrections/OTP-11090: Correct documentation of predefined and built-in types
2013-09-09Merge branch 'maint'Björn Gustavsson
* maint: core_lint: Correct the type error() to conform to the code
2013-09-09core_lint: Correct the type error() to conform to the codeBjörn Gustavsson
Commit 60984ade updated the code, but not the type spec. Noticed-by: Kostis Sagonas
2013-09-09Fix incorrect values returned by integer_to_binary/2Juan Jose Comellas
When integer_to_binary/2 receives 0 or a negative number as an argument with a base that is different from 10, it will return incorrect values (<<>> in the case of 0) or it will crash (with negative numbers). This commit fixes these problems and adds tests to cover these cases.
2013-09-09Merge branch 'maint'Björn Gustavsson
* maint: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
2013-09-09Merge branch 'bjorn/xml-encoding-fix/OTP-11310' into maintBjörn Gustavsson
* bjorn/xml-encoding-fix/OTP-11310: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
2013-09-09Merge branch 'maint'Björn-Egil Dahlberg
2013-09-09Merge branch 'lukas/erts/erl_exec_e' into maintBjörn-Egil Dahlberg
* lukas/erts/erl_exec_e: +e should be passed through erlexec
2013-09-09Merge branch 'maint'Björn-Egil Dahlberg