aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-24Merge branch 'egil/fix-master-merge'Björn-Egil Dahlberg
* egil/fix-master-merge: erl_docgen: Fix maint to master merge of OTP-11947
2014-09-23erl_docgen: Fix maint to master merge of OTP-11947Björn-Egil Dahlberg
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-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 branch 'maint'Björn-Egil Dahlberg
2014-09-22Merge branch 'egil/fix-erts-app/OTP-12189' into maintBjörn-Egil Dahlberg
* egil/fix-erts-app/OTP-12189: erts: Fix erts app-file
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-22Merge branch 'nox/fix-debug-hipe-lock-checking/OTP-12188' into maintMarcus Arendt
* nox/fix-debug-hipe-lock-checking/OTP-12188: Fix HiPE debug lock checking on OS X 64bit
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-22Merge branch 'siri/string-tokens-doc/OTP-12036' into maintSiri Hansen
* siri/string-tokens-doc/OTP-12036: Add note about adjacent separator characters in string:tokens/2
2014-09-19ssh: Avoid windows wierdnessIngela Anderton Andin
2014-09-19Merge branch 'nox/rm-generic_debug/OTP-12183'Marcus Arendt
* nox/rm-generic_debug/OTP-12183: Remove untested option 'generic_debug' from gen_server
2014-09-18[ct] Fix path of cover export/import filesSiri Hansen
5a3c4668 accidentially changed the base directory for cover export and import files, if given as relative paths. This commit fixes this - the files are again expected to be given relative to the directory of the cover spec file itself, or else as absolute paths.
2014-09-18ssh: Avoid timeout of init_per_test_case on some platformsIngela Anderton Andin
Also some code cleanup
2014-09-18Add note about adjacent separator characters in string:tokens/2Siri Hansen
Adjacent separator characters are treated as one in string:tokens/2. This was shown in the example in the reference manual but it was not written in words. A note about this is now added.
2014-09-18Next expected version... (may change)Marcus Arendt
2014-09-17Merge branch 'sverk/bin-alloc-refactor'Sverker Eriksson
* sverk/bin-alloc-refactor: erts: Fix gdb command etp-carrier-blocks for 32-bit erts: Refactor binary allocation interface to also initialize Binary
2014-09-17Merge branch 'sverk/valgrind-RC4-suppression'Sverker Eriksson
* sverk/valgrind-RC4-suppression: crypto: Add valgrind suppression for RC4
2014-09-17Merge tag 'OTP-17.3'Henrik Nord
=== OTP-17.3 === Changed Applications: - asn1-3.0.2 - common_test-1.8.2 - compiler-5.0.2 - crypto-3.4.1 - dialyzer-2.7.2 - diameter-1.7.1 - edoc-0.7.15 - erl_docgen-0.3.6 - erl_interface-3.7.18 - erts-6.2 - eunit-2.2.8 - hipe-3.11.1 - ic-4.3.6 - inets-5.10.3 - jinterface-1.5.10 - kernel-3.0.3 - megaco-3.17.2 - mnesia-4.12.3 - observer-2.0.2 - odbc-2.10.21 - os_mon-2.3 - ose-1.0.1 - public_key-0.22.1 - sasl-2.4.1 - snmp-5.1 - ssh-3.0.5 - ssl-5.3.6 - stdlib-2.2 - tools-2.7 - wx-1.3.1 Unchanged Applications: - cosEvent-2.1.15 - cosEventDomain-1.1.14 - cosFileTransfer-1.1.16 - cosNotification-1.1.21 - cosProperty-1.1.17 - cosTime-1.1.14 - cosTransactions-1.2.14 - debugger-4.0.1 - eldap-1.0.3 - et-1.5 - gs-1.5.16 - orber-3.7 - otp_mibs-1.0.9 - parsetools-2.0.11 - percept-0.8.9 - reltool-0.6.6 - runtime_tools-1.8.14 - syntax_tools-1.6.16 - test_server-3.7.1 - typer-0.9.8 - webtool-0.8.10 - xmerl-1.3.7 Conflicts: OTP_VERSION erts/vsn.mk
2014-09-16erts: Fix erts app-fileBjörn-Egil Dahlberg
2014-09-15Fixed typo: was/wereDavid N. Welton
2014-09-15Merge branch 'cdituri/epmd-pedantic-spellfix'Marcus Arendt
* cdituri/epmd-pedantic-spellfix: epmd: pedantic spelling fix in comments
2014-09-15epmd: pedantic spelling fix in commentsChris Dituri
Correct spelling errors in the run_daemon() comments which describe the redirection of stdin, stdout, and stderr to /dev/null for safety reasons.
2014-09-15Remove untested option 'generic_debug' from gen_serverAnthony Ramine
This undocumented option makes an init:get_argument/1 call every time a gen_server is started. Reported-By: James Fish
2014-09-15Merge branch 'maint'Siri Hansen
2014-09-15Updated OTP versionOTP-17.3Erlang/OTP
2014-09-15Update release notesErlang/OTP
2014-09-15Update version numbersErlang/OTP
2014-09-15Merge branch 'siri/megaco/fix-appup' into maintSiri Hansen
* siri/megaco/fix-appup: [megaco] Fix appup for OTP-17.3
2014-09-15Merge branch 'maint'Hans Nilsson
2014-09-15Merge branch 'hans/common_test/add_xml_p_tag' into maintHans Nilsson
2014-09-15common_test: Add p-tag to warning-tagHans Nilsson
2014-09-14Merge branch 'maint'Anders Svensson
2014-09-14Merge branch 'anders/diameter/17.3_release/OTP-12093' into maintAnders Svensson
* anders/diameter/17.3_release/OTP-12093: Add recompilation admonition to 17.2 release notes
2014-09-14Merge branch 'anders/diameter/Failed-AVP/OTP-12094' into maintAnders Svensson
* anders/diameter/Failed-AVP/OTP-12094: Fix ?MODULE in preprocessed dictionary forms
2014-09-14Add recompilation admonition to 17.2 release notesAnders Svensson
That dictionaries need to be recompiled, which is the case whenever diameter_gen.hrl is modified.
2014-09-12Fix ?MODULE in preprocessed dictionary formsAnders Svensson
By replacing literal diameter_gen_relay atoms in forms extracted from that module by the name of the module in question. This has been wrong for some time, but only became noticable when the parent commit started using ?MODULE as more than a process dictionary key or tag to match on. In particular, the function dict/1 in diameter_gen.hrl (included by every dictionary module) can now return ?MODULE, which is (not surprisingly) expected to be the name of the dictionary module in question. It wasn't in the case of a module compiled from forms: it was diameter_gen_relay, since that's the module the forms were extracted from. The fix only affects dictionaries compiled from forms, as returned by diameter_make:codec/2. In particular, dictionaries compiled from Erlang source returned by this function, or by diameterc(1), are unaffected.