aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-10-22Merge branch 'qrilka/patch-2/typo-fix' into maintMarcus Arendt
* qrilka/patch-2/typo-fix: Minor misprints correction
2014-10-21Merge branch 'peppe/common_test/crash_during_close' into maintPeter Andersson
* peppe/common_test/crash_during_close: Solve memory consumption problem Fix problem with buffered async io messages executed too late Don't generate weird exit if ct_logs has terminated before shut down OTP-12159
2014-10-20Merge branch 'bjorn/asn1/primitive-indefinite-length/OTP-12205' into maintBjörn Gustavsson
* bjorn/asn1/primitive-indefinite-length/OTP-12205: BER decoding: Don't allow primitives with indefinite lengths
2014-10-20Merge branch 'adelzhang/fix_application_master_comment' into maintBruce Yinhe
* adelzhang/fix_application_master_comment: Fix obsolete comment
2014-10-17Solve memory consumption problemPeter Andersson
2014-10-16Merge branch 'hans/ssh/correct_appup' into maintHans Nilsson
* hans/ssh/correct_appup: ssh: Fixes clause syntax error in ssh.appup.src
2014-10-16ssh: Fixes clause syntax error in ssh.appup.srcHans Nilsson
2014-10-15Merge branch 'hans/eldap/cuddle_with_tests' into maintHans Nilsson
2014-10-15Merge branch 'maint-17' into maintBruce Yinhe
Conflicts: OTP_VERSION
2014-10-14eldap: dynamically excludes unsupported ip versions.Hans Nilsson
2014-10-13Fix problem with buffered async io messages executed too latePeter Andersson
2014-10-13Merge branch 'sverk/port_get_data-race/OTP-12208' into maintSverker Eriksson
* sverk/port_get_data-race/OTP-12208: erts: Mend port_set_data with non-immed data for halfword VM erts: Add test case for port_set_data and port_get_data erts: Fix race between port_set_data, port_get_data and port termination erts: Fix erlang:port_set_data/2 for non immediate data
2014-10-13Merge branch 'archimed-shaman/leex_line_wrap_issue' into maintBruce Yinhe
OTP-12238 * archimed-shaman/leex_line_wrap_issue: Fix line counting in token and tokens functions Add unit test for string fun in leex test suite Fix the line counting in string function
2014-10-13Merge branch 'hans/ssh/closed_int/OTP-12004' into maintHans Nilsson
2014-10-13Updated OTP versionOTP-17.3.2Erlang/OTP
2014-10-13Update release notesErlang/OTP
2014-10-13Merge branch ↵Erlang/OTP
'ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227' into maint-17 * ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227: ssh: Prepare for release ssh: Add option sftp_vsn ssh: Fix option user_interaction to work as expected
2014-10-13Merge branch 'ia/17-patch/ssl/empty-sni-from-server/OTP-12198' into maint-17Erlang/OTP
* ia/17-patch/ssl/empty-sni-from-server/OTP-12198: ssl: Prepare for release ssl: Servers may include an empty SNI-extension
2014-10-13ssh: Prepare for releaseIngela Anderton Andin
2014-10-11Merge branch 'siri/observer/remove-doc-note/OTP-12078' into maintSiri Hansen
* siri/observer/remove-doc-note/OTP-12078: [observer] Remove note about R15B nodes in user guide
2014-10-10ssh: Add option sftp_vsnIngela Anderton Andin
2014-10-10[observer] Remove note about R15B nodes in user guideSiri Hansen
A note in the user guide says "Only R15B nodes can be observed". This note was written because the observer_backend module did not exist in earlier releases. It should have said "R15B or later". However, now that we are on OTP-17, we don't think the note is necessary anymore so it is now removed.
2014-10-10Merge branch 'hb/dialyzer/warnings_as_errors/OTP-12225' into maintHans Bolinder
* hb/dialyzer/warnings_as_errors/OTP-12225: dialyzer: do a minor re-factoring dialyzer: Ignore ERL_COMPILER_OPTIONS when compiling dialyzer: fix bug concerning compiler option 'warnings_as_errors'
2014-10-09ssh: Fix option user_interaction to work as expectedIngela Anderton Andin
When password authentication is implemented with ssh keyboard-interactive method and the password is already supplied, so that we do not need to query the user, connections should succeed even though the user_interaction option is set to false.
2014-10-09ssh: Corrected ret val from ssh_connection:subsystem/4.Hans Nilsson
2014-10-09ssh: testcaseHans Nilsson
2014-10-08Merge branch 'hans/update_gitignore' into maintHans Nilsson
* hans/update_gitignore: ct: .gitignore ct_property_test.xml
2014-10-08ct: .gitignore ct_property_test.xmlHans Nilsson
2014-10-08dialyzer: do a minor re-factoringHans Bolinder
A minor re-factoring and generalization.
2014-10-08Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [ct test] Explicitly unregister event receiver to avoid badarg
2014-10-08dialyzer: Ignore ERL_COMPILER_OPTIONS when compilingHans Bolinder
If, for instance, 'warn_unused_import' is present in ERL_COMPILER_OPTIONS then many files in Erlang/OTP (Kernel, STDLIB, ...) cannot be analyzed by Dialyzer since the option is not present when compiling Erlang/OTP, but 'warnings_as_errors' is. The case that ERL_COMPILER_OPTIONS contains 'warnings_as_errors' can only be handled by ignoring ERL_COMPILER_OPTIONS.
2014-10-08ssl: Prepare for releaseIngela Anderton Andin
2014-10-08ssl: Servers may include an empty SNI-extensionIngela Anderton Andin
2014-10-08dialyzer: fix bug concerning compiler option 'warnings_as_errors'Hans Bolinder
A typical scenario: the type digraph() is used in R16 (compilation with the option 'warnings_as_errors' results in no warning); then the module is analyzed by a 17 Dialyzer where digraph() is obsolete, and since the warning is turned into an error Dialyzer fails to load the module. Thanks to Michael Truog.
2014-10-08Minor misprints correctionKirill Zaborsky
2014-10-08Don't generate weird exit if ct_logs has terminated before shut downPeter Andersson
2014-10-06Merge branch 'vinoski/edlin-ctrl-u' into maintBruce Yinhe
OTP-12224 * vinoski/edlin-ctrl-u: Make shell ctrl-u save killed text correctly
2014-10-06Merge branch 'jjhoo/win32-fix-unreachable-code' into maintBruce Yinhe
OTP-12222 * jjhoo/win32-fix-unreachable-code: Fix if-clauses that make code to be unreachable
2014-10-06Merge branch 'ia/ssl/link-fix' into maintIngela Anderton Andin
* ia/ssl/link-fix: ssl: Fix link error in documentation
2014-10-06Merge branch 's1n4/httpc_doc_typo' into maintBruce Yinhe
OTP-12221 * s1n4/httpc_doc_typo: httpc: Fix a typo in the documentation
2014-10-03ssl: Fix link error in documentationIngela Anderton Andin
2014-10-02erts: Mend port_set_data with non-immed data for halfword VMSverker Eriksson
2014-10-02Merge branch 'sverk/etp-address-to-beam-opcode' into maintSverker Eriksson
* sverk/etp-address-to-beam-opcode: erts: Add gdb command etp-address-to-beam-opcode
2014-10-02Merge branch 'sverk/with-ssl-incl' into maintSverker Eriksson
* sverk/with-ssl-incl: Correct SSL_RUNTIME_LIBDIR when erl_xcomp_sysroot ends with a / Add configure option --with-ssl-incl=PATH OTP-12215 OTP-12216
2014-10-02Merge branch 'siri/appups-17.4' into maintSiri Hansen
* siri/appups-17.4: Fix stdlib.appup for OTP-17.4
2014-10-02Merge branch 'goofansu/fix-gen-event-comment' into maintBruce Yinhe
OTP-12214 * goofansu/fix-gen-event-comment: Fix typo in erlang-mode comment
2014-10-02httpc: Fix a typo in the documentationSina Samavati
2014-10-02Fix obsolete commentadelzhang
spawn_request/1 is obsolete since R11B-0
2014-10-01Make shell ctrl-u save killed text correctlySteve Vinoski
Fix edlin to correctly save text killed with ctrl-u. Prior to this fix, entering text into the Erlang shell and then killing it with ctrl-u followed by yanking it back with ctrl-y would result in the yanked text being the reverse of the original killed text. Add a test for the fix to interactive_shell_SUITE. (This is the same fix as in PR#416, but that PR was never completed.)
2014-10-01Merge branch 'ap/attribute_fun_arity_in_map/OTP-12213' into maintBjörn-Egil Dahlberg
* ap/attribute_fun_arity_in_map/OTP-12213: stdlib: Test Map attributes via erl_pp stdlib: erl_parse abstract Maps stdlib: Refactor ?line in erl_pp_SUITE:misc_attrs stdlib: Refactor Maps farity attributes Allow Name/Arity syntax in maps inside attributes