aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2014-09-30Merge branch 'maint'Henrik Nord
2014-09-30Merge branch 'maint-17' into maintHenrik Nord
2014-09-29Merge branch 'maint'Bruce Yinhe
2014-09-29Merge branch 'bruce-yinhe/fix-crypto-doc-typo' into maintBruce Yinhe
2014-09-29Prepare releaseErlang/OTP
2014-09-29Merge branch 'siri/dont-check-appup-from-current-vsn' into maint-17Erlang/OTP
2014-09-29Merge branch 'lars/orber/ipv6-service-context/OTP-12193' into maint-17Erlang/OTP
2014-09-29Merge branch 'ia/ssh/version-appup' into maint-17Erlang/OTP
2014-09-29Merge branch 'ia/ssh/listner-restart/OTP-12168' into maint-17Erlang/OTP
2014-09-29Merge branch 'ia/ssh/version-handling-gracefull/OTP-12157' into maint-17Erlang/OTP
2014-09-29Merge branch 'rickard/app-files/OTP-12178' into maint-17Erlang/OTP
2014-09-29Merge branch 'rickard/ose-relnotes/OTP-12177' into maint-17Erlang/OTP
2014-09-29Merge branch 'hans/ssh/parallel_login_not_working/OTP-12194' into maint-17Erlang/OTP
2014-09-26Merge branch 'maint'Bruce Yinhe
2014-09-26Merge branch 'matwey/makefile' into maintBruce Yinhe
2014-09-25ssh: Adjust supervisor tree to make sure new listningIngela Anderton Andin
2014-09-25ssh: Fixed parallel_login bug that made all logins serialHans Nilsson
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'legoscia/patch-8/dialyzer-doc-fix' into maintMarcus Arendt
2014-09-25Merge branch 'maint'Ingela Anderton Andin
2014-09-25Merge branch 'ia/ssl/empty-sni-from-server/OTP-12198' into maintIngela Anderton Andin
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'josevalim/jv-genevent' into maintMarcus Arendt
2014-09-25Merge branch 'siri/ct_netconfc-default-operation/OTP-10446'Siri Hansen
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'lemenkov/install_additional_headers/OTP-12197' into maintMarcus Arendt
2014-09-25Do not test appup of core apps for upgrade from current vsnSiri Hansen
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'vladdu/jinterface_enable_warnings' into maintMarcus Arendt
2014-09-24ssh: Add test case for ssh:stop_listnerIngela Anderton Andin
2014-09-24ssh: Add format_status/2 so sensitive data will not be present in logsIngela Anderton Andin
2014-09-24ssh: Gracefully handle incorrect versionsIngela Anderton Andin
2014-09-24ssl: Servers may include an empty SNI-extensionIngela Anderton Andin
2014-09-23erl_docgen: Fix maint to master merge of OTP-11947Björn-Egil Dahlberg
2014-09-23[orber] Fix problem with IPv6 addresses in service contextLars Thorsen
2014-09-23[ct_netconfc] Remove handle_msg and format_data from docSiri Hansen
2014-09-23[ct_netconfc] Add optional parameters to edit-configSiri Hansen
2014-09-23Fix a typo in crypto docBruce Yinhe
2014-09-22Merge branch 'maint'Björn-Egil Dahlberg
2014-09-22Merge branch 'egil/fix-maps-type-pretty-print/OTP-12190' into maintBjörn-Egil Dahlberg
2014-09-22Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-09-22Merge branch 'ia/ssh/cuddle-tests' into maintIngela Anderton Andin
2014-09-22ssh: ssh-3.0.6 will not support soft ugradeIngela Anderton Andin
2014-09-22Merge branch 'sstrollo/seb/obsolete_checking_fix/OTP-12187' into maintMarcus Arendt
2014-09-22Merge branch 'davidw/fix-typo-error-logger-doc' into maintMarcus Arendt
2014-09-22Merge branch 'nox/fix-exporting-rules/OTP-12186'Marcus Arendt
2014-09-22Merge branch 'maint'Siri Hansen
2014-09-22Merge branch 'siri/ct-cover-import-path/OTP-12031' into maintSiri Hansen
2014-09-22Merge branch 'maint'Siri Hansen
2014-09-19ssh: Avoid windows wierdnessIngela Anderton Andin