aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2012-04-24Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-04-24Merge branch 'ia/ssh/options-check-OTP-10061' into maintIngela Anderton Andin
2012-04-24Corrected ssh option handlingIngela Anderton Andin
2012-04-24Merge branch 'maint'Ingela Anderton Andin
2012-04-24Merge branch 'ia/ssh/close/OTP-10060' into maintIngela Anderton Andin
2012-04-23Merge branch 'maint'Björn-Egil Dahlberg
2012-04-23Merge branch 'egil/fix-wa-lcnt-debug' into maintBjörn-Egil Dahlberg
2012-04-20Merge branch 'maint'Sverker Eriksson
2012-04-20Revert vsn.mk for crypto and private_keySverker Eriksson
2012-04-20Merge branch 'sverk/crypto-rsa-key-opt' into maintSverker Eriksson
2012-04-20public_key: Use optimized RSA private key handlingSverker Eriksson
2012-04-20crypto: Optimize RSA private key handlingSverker Eriksson
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-19Merge branch 'pan/dtrace_merge_master_correction'Patrik Nyblom
2012-04-19Correct dtrace for master branchPatrik Nyblom
2012-04-18Merge branch 'maint'Patrik Nyblom
2012-04-18Revert "Extend erlang:port_info/1,2 to show the OS pid of a spawned process"Patrik Nyblom
2012-04-17Merge branch 'egil/inet-fix-doc-typos' into maintBjörn-Egil Dahlberg
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
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
2012-04-17Merge branch 'egil/r16/inet-remove-bit8/OTP-10056'Björn-Egil Dahlberg
2012-04-16Update preloaded prim_inet.beamBjörn-Egil Dahlberg
2012-04-16erts: Remove bit8 option from prim_inetBjörn-Egil Dahlberg
2012-04-16kernel, erts: Remove bit8 option from inetBjörn-Egil Dahlberg
2012-04-16Merge branch 'maint'Björn-Egil Dahlberg
2012-04-16Merge branch 'egil/inet-document-options/OTP-10053' into maintBjörn-Egil Dahlberg
2012-04-16kernel: Document ifaddr optionBjörn-Egil Dahlberg
2012-04-16kernel: Document tcp-, udp- and sctp_module optionBjörn-Egil Dahlberg
2012-04-16kernel: Remove bit8 option in specBjörn-Egil Dahlberg
2012-04-13Merge branch 'maint'Björn-Egil Dahlberg
2012-04-13Merge branch 'rr/wa-lcnt/OTP-10051' into maintBjörn-Egil Dahlberg
2012-04-13kernel: Document bit8 option in inet:setopts/2Björn-Egil Dahlberg
2012-04-13Merge branch 'maint'Gustav Simonsson
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
2012-04-11crypto: Remove unnecessary dependency to libsslSverker Eriksson
2012-04-11Merge branch 'maint-r14' into maint-r15Gustav Simonsson
2012-04-11Merge branch 'maint'Sverker Eriksson
2012-04-11Merge branch 'sverk/otp_build-no-commit-opt' into maintSverker Eriksson
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