aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-04-27Merge branch 'maint-r15' into maintLars Thorsen
* maint-r15: Update release notes Fix continuation bug in parse_default_decl_1/2
2012-04-27Merge branch 'maint-r15' into maintSverker Eriksson
Conflicts: erts/vsn.mk
2012-04-25Update release notesErlang/OTP
2012-04-25Merge branch 'lars/xmerl/cont-error-default-decl/OTP-10063' into maint-r15Erlang/OTP
* lars/xmerl/cont-error-default-decl/OTP-10063: Fix continuation bug in parse_default_decl_1/2
2012-04-25Prepare releaseSverker Eriksson
2012-04-25Merge branch 'rickard/driver_system_info/OTP-10059' into maint-r15Erlang/OTP
* rickard/driver_system_info/OTP-10059: Clear number of async threads if no thread support
2012-04-25Merge branch 'rickard/no_ets_write_concurrency-r15b01/OTP-10048' into maint-r15Erlang/OTP
* rickard/no_ets_write_concurrency-r15b01/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
2012-04-25Merge branch 'rickard/sched-busy-wait/OTP-10044' into maint-r15Erlang/OTP
* rickard/sched-busy-wait/OTP-10044: Add switch controlling scheduler busy wait Conflicts: erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h
2012-04-25Merge branch 'rickard/sched-wakeup-other-r15b01/OTP-10033' into maint-r15Erlang/OTP
* rickard/sched-wakeup-other-r15b01/OTP-10033: Implement proposal for new scheduler wakeup strategy
2012-04-24Merge branch 'ia/ssh/options-check-OTP-10061' into maintIngela Anderton Andin
* ia/ssh/options-check-OTP-10061: Corrected ssh option handling
2012-04-24Corrected ssh option handlingIngela Anderton Andin
The option ip_v6_disabled and the undocumented option exec was incorrectly handled by the option checking code. There where two options for allowing user interaction one documented and one undocumented, they where merge to to be the documented one. For backwards compatibility the undocumented one is transformed to the documented one in the option checking code.
2012-04-24Merge branch 'ia/ssh/close/OTP-10060' into maintIngela Anderton Andin
* ia/ssh/close/OTP-10060: Avoid sending two ssh close messages
2012-04-23Merge branch 'rickard/sched-wakeup-other/OTP-10033' into ↵Rickard Green
rickard/sched-wakeup-other-r15b01/OTP-10033 Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
2012-04-23Add switch controlling scheduler busy waitRickard Green
2012-04-23Implement proposal for new scheduler wakeup strategyRickard Green
2012-04-23Merge branch 'egil/fix-wa-lcnt-debug' into maintBjörn-Egil Dahlberg
* egil/fix-wa-lcnt-debug: erts: The lck->extra field needs 'TAGGED' data
2012-04-23Fix continuation bug in parse_default_decl_1/2Lars Thorsen
2012-04-20Revert vsn.mk for crypto and private_keySverker Eriksson
Included them by "mistake".
2012-04-20Merge branch 'sverk/crypto-rsa-key-opt' into maintSverker Eriksson
* sverk/crypto-rsa-key-opt: public_key: Use optimized RSA private key handling crypto: Optimize RSA private key handling crypto: Remove unnecessary dependency to libssl OTP-10064 OTP-10065
2012-04-20public_key: Use optimized RSA private key handlingSverker Eriksson
by providing extra redundant information to crypto.
2012-04-20crypto: Optimize RSA private key handlingSverker Eriksson
by using extra redundant information as part of the key that will speed things up for OpenSSL. Affects rsa_sign, rsa_private_encrypt and rsa_private_decrypt.
2012-04-20erts: The lck->extra field needs 'TAGGED' dataBjörn-Egil Dahlberg
2012-04-20Avoid sending two ssh close messagesIngela Anderton Andin
2012-04-18Clear number of async threads if no thread supportRickard Green
2012-04-17Merge branch 'egil/inet-fix-doc-typos' into maintBjörn-Egil Dahlberg
* egil/inet-fix-doc-typos: doc: Add 'is' to explanation of callback modules doc: Fix typo in inet
2012-04-17doc: Add 'is' to explanation of callback modulesBjörn-Egil Dahlberg
2012-04-17doc: Fix typo in inetBjörn-Egil Dahlberg
2012-04-17Merge branch 'pg/r15/add-os-pid-to-port-info' into maintPatrik Nyblom
* pg/r15/add-os-pid-to-port-info: tests: Remove line macro from port_bif_SUITE Correct documentation, erl_bif_types and dialyzer tests Make port_info(Port,os_pid) work on Windows Extend erlang:port_info/1,2 to show the OS pid of a spawned process OTP-10057
2012-04-17tests: Remove line macro from port_bif_SUITEBjörn-Egil Dahlberg
2012-04-17Correct documentation, erl_bif_types and dialyzer testsPatrik Nyblom
2012-04-17Make port_info(Port,os_pid) work on WindowsBjörn-Egil Dahlberg
2012-04-17Extend erlang:port_info/1,2 to show the OS pid of a spawned processMatthias Lang
When spawning OS (unix) processes with erlang:open_port, store the resulting unix pid so that it can be queried later on using erlang:port_info/1,2.
2012-04-16Merge branch 'egil/inet-document-options/OTP-10053' into maintBjörn-Egil Dahlberg
* egil/inet-document-options/OTP-10053: kernel: Document ifaddr option kernel: Document tcp-, udp- and sctp_module option kernel: Remove bit8 option in spec kernel: Document bit8 option in inet:setopts/2 kernel: Initial doc of forgotten inet options
2012-04-16kernel: Document ifaddr optionBjörn-Egil Dahlberg
* same as ip option
2012-04-16kernel: Document tcp-, udp- and sctp_module optionBjörn-Egil Dahlberg
2012-04-16kernel: Remove bit8 option in specBjörn-Egil Dahlberg
* The option is removed to force warnings for dialyzer
2012-04-13Merge branch 'rr/wa-lcnt/OTP-10051' into maintBjörn-Egil Dahlberg
* rr/wa-lcnt/OTP-10051: lcnt: Let runq locks reflect actual call location lcnt: Enhancement fixups erts: Add lcnt port and suspend options Increase ethr event and lock counting constants to allow at least +A 1024.
2012-04-13kernel: Document bit8 option in inet:setopts/2Björn-Egil Dahlberg
* This is a highly specialized option which is probably not used and will be removed in R16
2012-04-13Merge branch 'maint-r15' into maintGustav Simonsson
2012-04-12Update .gitignoreBjörn-Egil Dahlberg
2012-04-12eldap: Update .gitignoreBjörn-Egil Dahlberg
2012-04-12kernel: Initial doc of forgotten inet optionsBjörn-Egil Dahlberg
* UDP: ulticast_if, multicast_loop and multicast_ttl, add_membership and drop_membership * Inet: bit8, buffer, deliver, high_watermark, linger and low_watermark
2012-04-11crypto: Remove unnecessary dependency to libsslSverker Eriksson
crypto only uses libcrypto. Superfluous dependency introduced in R14B04 by 52230a417ad0057.
2012-04-11Merge branch 'maint-r14' into maint-r15Gustav Simonsson
2012-04-11Merge branch 'sverk/otp_build-no-commit-opt' into maintSverker Eriksson
* sverk/otp_build-no-commit-opt: Add --no-commit option to update_primary and update_preloaded
2012-04-11Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14Gustav Simonsson
2012-04-10lcnt: Let runq locks reflect actual call locationRick Reed
2012-04-10lcnt: Enhancement fixupsBjörn-Egil Dahlberg
2012-04-10Add --no-commit option to update_primary and update_preloadedSverker Eriksson
2012-04-05erts: Add lcnt port and suspend optionsRick Reed
* Add new suspend, location, and port_locks options to erts_debug:lock_counters. * Init and destroy lock counting for processes and ports as appropriate. Conflicts: erts/emulator/beam/erl_bif_info.c