aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2014-09-30Merge branch 'maint'Henrik Nord
2014-09-30Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION lib/ssh/test/ssh_connection_SUITE.erl
2014-09-29Merge branch 'maint'Bruce Yinhe
2014-09-29Merge branch 'bruce-yinhe/fix-crypto-doc-typo' into maintBruce Yinhe
* bruce-yinhe/fix-crypto-doc-typo: Fix a typo in crypto doc
2014-09-29Prepare releaseErlang/OTP
2014-09-29Merge branch 'siri/dont-check-appup-from-current-vsn' into maint-17Erlang/OTP
* siri/dont-check-appup-from-current-vsn: Do not test appup of core apps for upgrade from current vsn
2014-09-29Merge branch 'lars/orber/ipv6-service-context/OTP-12193' into maint-17Erlang/OTP
* lars/orber/ipv6-service-context/OTP-12193: [orber] Fix problem with IPv6 addresses in service context
2014-09-29Merge branch 'ia/ssh/version-appup' into maint-17Erlang/OTP
* ia/ssh/version-appup: ssh: ssh-3.0.6 will not support soft ugrade
2014-09-29Merge branch 'ia/ssh/listner-restart/OTP-12168' into maint-17Erlang/OTP
* ia/ssh/listner-restart/OTP-12168: ssh: Adjust supervisor tree to make sure new listning options are honored ssh: Add test case for ssh:stop_listner
2014-09-29Merge branch 'ia/ssh/version-handling-gracefull/OTP-12157' into maint-17Erlang/OTP
* ia/ssh/version-handling-gracefull/OTP-12157: ssh: Add format_status/2 so sensitive data will not be present in logs ssh: Gracefully handle incorrect versions
2014-09-29Merge branch 'rickard/app-files/OTP-12178' into maint-17Erlang/OTP
* rickard/app-files/OTP-12178: Add erl_interface and jinterface .app files
2014-09-29Merge branch 'rickard/ose-relnotes/OTP-12177' into maint-17Erlang/OTP
* rickard/ose-relnotes/OTP-12177: Add missing release notes
2014-09-29Merge branch 'hans/ssh/parallel_login_not_working/OTP-12194' into maint-17Erlang/OTP
* hans/ssh/parallel_login_not_working/OTP-12194: ssh: Fixed parallel_login bug that made all logins serial
2014-09-26Merge branch 'maint'Bruce Yinhe
2014-09-26Merge branch 'matwey/makefile' into maintBruce Yinhe
OTP-12200 * matwey/makefile: Cleanup parse_transform modules in eunit Cleanup behaviour modules in ssl Cleanup behaviour modules in ssh Fix a typo in clean section of otp_mibs makefile
2014-09-25ssh: Adjust supervisor tree to make sure new listningIngela Anderton Andin
options are honored
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
* legoscia/patch-8/dialyzer-doc-fix: Add note about known issue with -Wrace_conditions
2014-09-25Merge branch 'maint'Ingela Anderton Andin
2014-09-25Merge branch 'ia/ssl/empty-sni-from-server/OTP-12198' into maintIngela Anderton Andin
* ia/ssl/empty-sni-from-server/OTP-12198: ssl: Servers may include an empty SNI-extension
2014-09-25Merge branch 'maint'Marcus Arendt
Conflicts: lib/stdlib/src/gen_event.erl
2014-09-25Merge branch 'josevalim/jv-genevent' into maintMarcus Arendt
* josevalim/jv-genevent: Do not rely on macros with implicit vars
2014-09-25Merge branch 'siri/ct_netconfc-default-operation/OTP-10446'Siri Hansen
* siri/ct_netconfc-default-operation/OTP-10446: [ct_netconfc] Remove handle_msg and format_data from doc [ct_netconfc] Add optional parameters to edit-config
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'lemenkov/install_additional_headers/OTP-12197' into maintMarcus Arendt
* lemenkov/install_additional_headers/OTP-12197: Install internal hrl files when necessary
2014-09-25Do not test appup of core apps for upgrade from current vsnSiri Hansen
The appup tests for kernel, stdlib and sasl tests that the appup file allows upgrade from the previous and current major release to the current release. If, in the current release, the application version was not changed compared to the previous release, then we would still test that the appup supported the upgrade (i.e. from current release to current release). This is now changed, in order to avoid test failures on patch releases where kernel, stdlib and sasl are not changed.
2014-09-25Merge branch 'maint'Marcus Arendt
2014-09-25Merge branch 'vladdu/jinterface_enable_warnings' into maintMarcus Arendt
* vladdu/jinterface_enable_warnings: let Java compiler output all warnings
2014-09-24ssh: Add test case for ssh:stop_listnerIngela Anderton Andin
Conflicts: lib/ssh/test/ssh_connection_SUITE.erl
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
Conflicts: lib/ssh/test/ssh_connection_SUITE.erl
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
These functions were missing @private edoc tags and were erroneously shown in the reference manual.
2014-09-23[ct_netconfc] Add optional parameters to edit-configSiri Hansen
Earlier there was no way to add optional parameters like default-operation to an edit-config request sent with ct_netconfc:edit_config/3,4, you had to use ct_netconfc:send_rpc/2,3. For simplicity and completion, a new optional argument, OptParams, is now added to the edit_config function.
2014-09-23Fix a typo in crypto docBruce Yinhe
Thanks to @ino_murko from Twitter
2014-09-22Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: lib/stdlib/src/erl_pp.erl
2014-09-22Merge branch 'egil/fix-maps-type-pretty-print/OTP-12190' into maintBjörn-Egil Dahlberg
* egil/fix-maps-type-pretty-print/OTP-12190: edoc, erl_docgen: Enhance internal map type format stdlib: Fix maps type pretty printing
2014-09-22Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-09-22Merge branch 'ia/ssh/cuddle-tests' into maintIngela Anderton Andin
* ia/ssh/cuddle-tests: ssh: Avoid windows wierdness ssh: Avoid timeout of init_per_test_case on some platforms
2014-09-22ssh: ssh-3.0.6 will not support soft ugradeIngela Anderton Andin
Customer requesting patch will not use soft upgrade and as it will be hard to meet customer deadline and assure quality of soft upgrade we decided to make it an application restart.
2014-09-22Merge branch 'sstrollo/seb/obsolete_checking_fix/OTP-12187' into maintMarcus Arendt
* sstrollo/seb/obsolete_checking_fix/OTP-12187: Fix broken deprecation warnings in ssh application
2014-09-22Merge branch 'davidw/fix-typo-error-logger-doc' into maintMarcus Arendt
* davidw/fix-typo-error-logger-doc: Fixed typo: was/were
2014-09-22Merge branch 'nox/fix-exporting-rules/OTP-12186'Marcus Arendt
* nox/fix-exporting-rules/OTP-12186: Rewrite merge of clause variable tables (in case, try, etc)
2014-09-22Merge branch 'maint'Siri Hansen
2014-09-22Merge branch 'siri/ct-cover-import-path/OTP-12031' into maintSiri Hansen
* siri/ct-cover-import-path/OTP-12031: [ct] Fix path of cover export/import files
2014-09-22Merge branch 'maint'Siri Hansen
Conflicts: OTP_VERSION
2014-09-19ssh: Avoid windows wierdnessIngela Anderton Andin
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 23:44:06 +0000