aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-04-10Merge branch 'maint'Fredrik Gustafsson
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/init.beam erts/preloaded/ebin/otp_ring0.beam erts/preloaded/ebin/prim_file.beam erts/preloaded/ebin/prim_inet.beam erts/preloaded/ebin/prim_zip.beam erts/preloaded/ebin/zlib.beam
2013-04-10Update preloaded modulesFredrik Gustafsson
2013-04-10Merge branch 'atj/atj-fix-message_que_len-typo/OTP-11024' into maintFredrik Gustafsson
* atj/atj-fix-message_que_len-typo/OTP-11024: Fix typo in type: erlang:process_info_item()
2013-04-10Merge branch 'maint'Siri Hansen
2013-04-10Merge branch 'siri/common_test/unexpected_io/OTP-10494' into maintSiri Hansen
* siri/common_test/unexpected_io/OTP-10494: [common_test] Add test for unexpected I/O [common_test] Send unexpected logging to test_server's unexpected_io.log [test_server] Add test_server_io:print_unexpected/1
2013-04-09Merge branch 'maint'Fredrik Gustafsson
2013-04-09Merge branch 'fredrik/stdlib/fix_broken_link' into maintFredrik Gustafsson
* fredrik/stdlib/fix_broken_link: Fixed broken links in sys.html
2013-04-09Merge branch 'maint'Hans Bolinder
* maint: Ignore JPG files
2013-04-09Merge branch 'hb/debugger/strings/OTP-10899' into maintHans Bolinder
* hb/debugger/strings/OTP-10899: Ignore JPG files
2013-04-08Ignore JPG filesHans Bolinder
2013-04-08Merge branch 'maint'Anders Svensson
2013-04-08Merge branch 'anders/diameter/service_config/OTP-11017' into maintAnders Svensson
* anders/diameter/service_config/OTP-11017: Fix handling of unknown options to diameter:start_service/2
2013-04-08Merge branch 'anders/diameter/release_notes/OTP-11014' into maintAnders Svensson
* anders/diameter/release_notes/OTP-11014: Fix faulty capitalization in generated release notes
2013-04-08Merge branch 'maint'Fredrik Gustafsson
2013-04-08Merge branch 'fredrik/ssh/ssh_daemon_pass_arg/OTP-10975' into maintFredrik Gustafsson
* fredrik/ssh/ssh_daemon_pass_arg/OTP-10975: ssh: If not valid expression, rather than generate a error, try to use the cmd.
2013-04-08Merge branch 'maint'Siri Hansen
2013-04-08Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [reltool] Clean up work dir after test [observer] Add debug printouts in ttb_SUITE
2013-04-08[common_test] Add test for unexpected I/OSiri Hansen
2013-04-08[common_test] Send unexpected logging to test_server's unexpected_io.logSiri Hansen
If it could not be decided which test case a certain log printout belonged to, the common test framework log was earlier used. Such printouts are now instead sent to unexpected_io.log in test_server so that there is only one place to look for "missing" printouts.
2013-04-08[test_server] Add test_server_io:print_unexpected/1Siri Hansen
To use from any process to print a string in the unexpected_io.log.
2013-04-08Merge branch 'maint'Hans Bolinder
* maint: Remove unused Postscript files
2013-04-08Merge branch 'hb/remove_unused_ps_files/OTP-11016' into maintHans Bolinder
* hb/remove_unused_ps_files/OTP-11016: Remove unused Postscript files
2013-04-08Remove unused Postscript filesHans Bolinder
2013-04-08Merge remote branch 'upstream/maint'Ingela Anderton Andin
2013-04-08Merge branch 'ia/ssl/crypto/PSK-SRP/doc' into maintIngela Anderton Andin
* ia/ssl/crypto/PSK-SRP/doc: ssl & crypto: Documentation enhancements
2013-04-07Fix typo in type: erlang:process_info_item()Andrew Tunnell-Jones
'message_que_len' should be 'message_queue_len'.
2013-04-06Fix faulty capitalization in generated release notesAnders Svensson
Diameter = the protocol diameter = the Erlang application
2013-04-06Fix handling of unknown options to diameter:start_service/2Anders Svensson
{error, Reason} is now returned, instead of the options being ignored. Note that diameter:add_transport/2 purposely ignores unknown options and that the behaviour is documented. This is historic: some users depend on it in order to store their own options for identifying transport config, instead of using the reference returned by add_transport.
2013-04-05Merge branch 'maint'Patrik Nyblom
2013-04-05Merge branch 'maint-r16' into maintPatrik Nyblom
Conflicts: erts/vsn.mk
2013-04-05ssh: If not valid expression, rather than generate a error, try to use the cmd.Fredrik Gustafsson
2013-04-05ssl & crypto: Documentation enhancementsIngela Anderton Andin
OTP-10450
2013-04-05Fixed broken links in sys.htmlFredrik Gustafsson
2013-04-05Merge branch 'maint'Hans Bolinder
* maint: Remove unused XML files
2013-04-05Merge branch 'hb/remove_unused_xml_files' into maintHans Bolinder
* hb/remove_unused_xml_files: Remove unused XML files
2013-04-04Prepare releaseErlang/OTP
2013-04-04Merge branch 'egil/r16/fix-delete_element/OTP-10932' into maint-r16Erlang/OTP
* egil/r16/fix-delete_element/OTP-10932: erts: Refactor erlang:insert_element/3 for clarity erts: Fix copy error in erlang:delete_element/2
2013-04-04Merge branch 'rickard/sys-flags/OTP-11000' into maint-r16Erlang/OTP
* rickard/sys-flags/OTP-11000: Fix `+sws' and `+swt' system flags
2013-04-04Merge branch 'rickard/thr_prgr_later_op/OTP-10994' into maint-r16Erlang/OTP
* rickard/thr_prgr_later_op/OTP-10994: Make port close not be delayed Be less eager requesting wakeup for cleanup jobs
2013-04-04Merge branch 'rickard/is_process_alive/OTP-10926' into maint-r16Erlang/OTP
* rickard/is_process_alive/OTP-10926: Fix erlang:is_process_alive/1
2013-04-04Make port close not be delayedPatrik Nyblom
Drivers are dereferenced when the port is completely gone, in the operation scheduled with erts_schedule_thr_prgr_later_op. If we use erts_schedule_thr_prgr_later_cleanup_op, it may not happen for a long time and the driver can not be unloaded. We can not dereference the driver before the thread_progress_later thing, because references to the driver may exist in other threads, so the unloading of the driver may free locks held by other schedulers and whatnot.
2013-04-04Remove unused XML filesHans Bolinder
incompatible.xml and highlights.xml haven't been included anywhere for a long time.
2013-04-04Merge branch 'maint'Siri Hansen
2013-04-04Merge branch 'siri/test_server/hanging-io-request/OTP-10991' into maintSiri Hansen
* siri/test_server/hanging-io-request/OTP-10991: [test_server] Don't hang due to invalid io request
2013-04-04Merge branch 'siri/common_test/force_stop-skip_rest/OTP-10856' into maintSiri Hansen
* siri/common_test/force_stop-skip_rest/OTP-10856: [common_test] Document '-force_stop skip_rest' option to ct_run [common_test] Add tests for repeated testruns [common_test] Add support for testing repeated testruns [common_test] Add -force_stop skip_rest option when repeating tests
2013-04-04Merge branch 'maint'Fredrik Gustafsson
2013-04-04Merge branch 'sv/stdlib/sys-get-state/OTP-11013' into maintFredrik Gustafsson
* sv/stdlib/sys-get-state/OTP-11013: Removed ?line macro add sys:get_state/1,2 and sys:replace_state/2,3 update sys:get_status/2,3 documentation for gen_event
2013-04-04Merge branch 'maint'Fredrik Gustafsson
2013-04-04Merge branch 'fredrik/erts/to_erl_handshake/OTP-11012' into maintFredrik Gustafsson
* fredrik/erts/to_erl_handshake/OTP-11012: Changed handshake from to_erl to run_erl, on behalf of shell search
2013-04-04Changed handshake from to_erl to run_erl, on behalf of shell searchFredrik Gustafsson