aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2012-11-16Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-16Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maintIngela Anderton Andin
2012-11-16Prepare for releaseIngela Anderton Andin
2012-11-16public_key: Add PKCS-10 documentation and PKCS-7 test caseIngela Anderton Andin
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/r15/erlang-spec-error/process_info' into maintPatrik Nyblom
2012-11-16Correct spec for erlang:process_info(Pid,links)Patrik Nyblom
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/port_driver_tutorial/OTP-10573' into maintPatrik Nyblom
2012-11-16Bring driver tutorial up to date.Patrik Nyblom
2012-11-16Merge branch 'maint'Rickard Green
2012-11-16Merge branch 'rickard/native-doc/OTP-10557' into maintRickard Green
2012-11-16Merge branch 'rickard/ets-mem-bug/OTP-10558' into maintRickard Green
2012-11-15Add clearer warnings about misuse of NIF and driver functionalityRickard Green
2012-11-15Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-15Merge branch 'ia/ssl/prepare-for-release' into maintIngela Anderton Andin
2012-11-15public_key: Simplified PKCS-7 and PKCS-10 specs.Ingela Anderton Andin
2012-11-15public_key: Added PKCS-10Fredrik Gustafsson
2012-11-15public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS.Kenneth Lundin
2012-11-15public_key: Add PKCS-7Ingela Anderton Andin
2012-11-15Merge branch 'maint'Siri Hansen
2012-11-15Merge branch 'siri/common_test/ct_netconfc-close-problems' into maintSiri Hansen
2012-11-15Merge branch 'siri/test_server/faulty-tag-printout-for-connection-log/OTP-105...Siri Hansen
2012-11-14ssl: Update vsn.mk and ssl.appup.src for releaseIngela Anderton Andin
2012-11-14[test_server] Recognize and ignore info_reports for ct connectionsSiri Hansen
2012-11-14Merge branch 'vd/jinterface_epmd_localhost'Henrik Nord
2012-11-14[common_test] Allow server to terminate netconf session before rpc-replySiri Hansen
2012-11-14[common_test] Ensure process down after ct_netconf:close_sessionSiri Hansen
2012-11-14Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-14Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maintIngela Anderton Andin
2012-11-13Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maintSverker Eriksson
2012-11-13erts: Change assembler comment for hipe on x86 and amd64Sverker Eriksson
2012-11-13erts: Fix compile error on solaris in generated hipe_amd64_bifs.SSverker Eriksson
2012-11-13ssl: Make sure that the ssl connection process will not hang in terminate fun...Ingela Anderton Andin
2012-11-13ssl: Add default values to emulated socket options in internal recordIngela Anderton Andin
2012-11-12Merge branch 'sverk/halfword-valgrind-suppressions' into maintSverker Eriksson
2012-11-12Merge branch 'maint'Björn Gustavsson
2012-11-12Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maintBjörn Gustavsson
2012-11-12Fix merge from maintRickard Green
2012-11-12Merge branch 'maint'Rickard Green
2012-11-12Merge branch 'rickard/port-sched-bug/OTP-10556' into maintRickard Green
2012-11-12Merge branch 'rickard/sched-wakeup/OTP-10476' into maintRickard Green
2012-11-12ssl: Adopt test case to not take so longIngela Anderton Andin
2012-11-12Merge branch 'maint'Fredrik Gustafsson
2012-11-12Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maintFredrik Gustafsson
2012-11-09Ssh appup modificationsFredrik Gustafsson
2012-11-09Merge branch 'maint'Lukas Larsson
2012-11-09Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maintLukas Larsson
2012-11-09Fix bug where require of same name at same config would return name in useLukas Larsson
2012-11-09Merge remote branch 'upstream/maint'Ingela Anderton Andin