aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-08-08Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-08Merge branch 'ia/ssl/setopt-renegotiation-bug/OTP-11228' into maintIngela Anderton Andin
* ia/ssl/setopt-renegotiation-bug/OTP-11228: ssl: Setopts during renegotiation caused the renegotiation to be unsuccessful.
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: stdlib: Include file:all datatypes in filelib
2013-08-08Merge branch 'lukas/r16b02/docfixes' into maintLukas Larsson
* lukas/r16b02/docfixes: stdlib: Include file:all datatypes in filelib
2013-08-08stdlib: Include file:all datatypes in filelibLukas Larsson
2013-08-08Merge branch 'maint'Fredrik Gustafsson
2013-08-08Merge branch 'olgeni/erl_driver-man-fixes/OTP-11227' into maintFredrik Gustafsson
* olgeni/erl_driver-man-fixes/OTP-11227: Misc. corrections for erl_driver(3)
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: etp: Do not use name as beam.smp is the name on Linux
2013-08-08Merge branch 'lukas/erts/etp-thr/OTPO-11220' into maintLukas Larsson
* lukas/erts/etp-thr/OTPO-11220: etp: Do not use name as beam.smp is the name on Linux
2013-08-08etp: Do not use name as beam.smp is the name on LinuxLukas Larsson
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: erts: Create gdb pything script for thread listing
2013-08-08Merge branch 'lukas/erts/etp-thr/OTPO-11220' into maintLukas Larsson
* lukas/erts/etp-thr/OTPO-11220: erts: Create gdb pything script for thread listing
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: Add smoke tests
2013-08-08Merge branch 'lukas/smoketests/OTP-11221' into maintLukas Larsson
* lukas/smoketests/OTP-11221: Add smoke tests
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: Bailout if no native implementations are found
2013-08-08Merge branch 'lukas/erts/ethr_smp_req_native_compiletime/OTP-11196' into maintLukas Larsson
* lukas/erts/ethr_smp_req_native_compiletime/OTP-11196: Bailout if no native implementations are found
2013-08-08Merge branch 'maint'Fredrik Gustafsson
2013-08-08Merge branch 'tomaon/fix-typo-httpd-doc/OTP-11226' into maintFredrik Gustafsson
* tomaon/fix-typo-httpd-doc/OTP-11226: fix: typo, inets/doc/src/httpd
2013-08-07ssl: Setopts during renegotiation caused the renegotiation to be unsuccessful.Ingela Anderton Andin
If calling setopts during a renegotiation the FSM state might change during the handling of the setopts messages, this is now handled correctly.
2013-08-07Misc. corrections for erl_driver(3)olgeni
- Remove trailing whitespaces - Spelling fixes - Replace "deferred" with "deprecated" where applicable - Remove reference to non-existing "async_ready" entry point
2013-08-07fix: typo, inets/doc/src/httpdtomaon
2013-08-07Merge branch 'maint'Fredrik Gustafsson
2013-08-07Merge branch 'weisslj/fix-gcc40-arm-compile-error/OTP-11214' into maintFredrik Gustafsson
* weisslj/fix-gcc40-arm-compile-error/OTP-11214: Fix compile error on ARM and GCC < 4.1.0
2013-08-07Merge branch 'maint'Fredrik Gustafsson
2013-08-07Merge branch 'fredrik/xmerl/fix_doc/OTP-11224' into maintFredrik Gustafsson
* fredrik/xmerl/fix_doc/OTP-11224: xmerl: fix typos
2013-08-07Merge branch 'maint'Peter Andersson
2013-08-07Merge remote branch 'origin/peppe/common_test/ct_log_updates' into maintPeter Andersson
* origin/peppe/common_test/ct_log_updates: Make the CT logger print to stdout if test_server is not running Add test Allow calls to ct:pal and ct:print even if CT is not running OTP-11176
2013-08-06xmerl: fix typosFredrik Gustafsson
2013-08-05Merge branch 'maint'Fredrik Gustafsson
2013-08-05Merge branch 'fredrik/inet/clarify_doc_address/OTP-10676' into maintFredrik Gustafsson
* fredrik/inet/clarify_doc_address/OTP-10676: kernel: fixed specs to inet:ntoa/1 kernel: changed tests where inet_parse:ntoa/1 was used to inet:parse/1 kernel: added ntoa documentation and exported it in inet.erl kernel: clarified inet:parse_address/1 referrering to old code
2013-08-05Add smoke testsLukas Larsson
Smoke tests are meant to verify that a build of erlang has been successfull.
2013-08-05Merge branch 'maint'Fredrik Gustafsson
2013-08-05Merge branch 'weisslj/fix-abcast-comment-typo/OTP-11219' into maintFredrik Gustafsson
* weisslj/fix-abcast-comment-typo/OTP-11219: Fix typo in abcast() function comment
2013-08-05erts: Create gdb pything script for thread listingLukas Larsson
2013-08-01Fix typo in abcast() function commentJohannes Weißl
2013-08-01Merge branch 'maint'Patrik Nyblom
2013-08-01Merge branch 'pan/erlang_halt_2_wrong_flush_default/OTP-11218' into maintPatrik Nyblom
* pan/erlang_halt_2_wrong_flush_default/OTP-11218: Change default of erlang:halt/2 to the documented
2013-08-01Merge branch 'maint'Fredrik Gustafsson
2013-08-01Merge branch 'mmalecki/fix-solaris/OTP-11213' into maintFredrik Gustafsson
* mmalecki/fix-solaris/OTP-11213: Fix compilation on Solaris
2013-07-31Merge branch 'maint'Anders Svensson
2013-07-31Merge branch 'anders/diameter/UTF8String_encode/OTP-11172' into maintAnders Svensson
* anders/diameter/UTF8String_encode/OTP-11172: Simplify Address encode/decode Use module unicode for UTF8String encode/decode Fix UTF8String encode
2013-07-30Simplify Address encode/decodeAnders Svensson
By using binary comprehensions. Add string-valued addresses to codec suite.
2013-07-30Use module unicode for UTF8String encode/decodeAnders Svensson
The original code predates that module but there's no reason not to use it now.
2013-07-30Fix UTF8String encodeAnders Svensson
To accept any nested list of codepoints and binaries. A list containing a binary was previously misinterpreted and the documentation was incomplete. Also, rework codec suite slightly to be able to specify values for which decode o encode is the identity map, for which encode should succeed, and for which encode should fail.
2013-07-30kernel: fixed specs to inet:ntoa/1Fredrik Gustafsson
2013-07-30kernel: changed tests where inet_parse:ntoa/1 was used to inet:parse/1Fredrik Gustafsson
2013-07-30kernel: added ntoa documentation and exported it in inet.erlFredrik Gustafsson
2013-07-30kernel: clarified inet:parse_address/1 referrering to old codeFredrik Gustafsson
2013-07-30Change default of erlang:halt/2 to the documentedPatrik Nyblom
Bug reported by Jose Valim on the erlang-bugs mailing list: erlang:halt(0,[]) does not flush as advertised in the documentation. Should be the same as erlang:halt(0,[{flush,true}]), but is in fact the same as erlang:halt(0,[{flush,false}]).
2013-07-30Merge branch 'maint'Fredrik Gustafsson