aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-07-08Merge branch 'maint'Fredrik Gustafsson
2013-07-08Merge branch 'hirotnk/nif-typo-fix' into maintFredrik Gustafsson
* hirotnk/nif-typo-fix: Fix Nif doc typos
2013-07-07Fix Nif doc typosYoshihiro Tanaka
2013-07-02Merge branch 'maint'Fredrik Gustafsson
2013-07-02Merge branch 'fredrik/fix_readme_pulls' into maintFredrik Gustafsson
* fredrik/fix_readme_pulls: readme: changed information about pull requests
2013-07-01Merge branch 'maint'Fredrik Gustafsson
2013-07-01Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-07-01Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.appup.src lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk
2013-07-01Merge branch 'maint'Fredrik Gustafsson
2013-07-01Merge branch 'jwh/httpc_delete_body/OTP-11190' into maintFredrik Gustafsson
* jwh/httpc_delete_body/OTP-11190: httpc: Allow content body in DELETE requests
2013-06-28Update release notesErlang/OTP
2013-06-28Merge branch 'fredrik/ssh/error_disconnect/OTP-11188' into maint-r15Erlang/OTP
* fredrik/ssh/error_disconnect/OTP-11188: ssh: version updates ssh: fixed bad match failure when disconnect msg
2013-06-28Merge branch 'fredrik/inets/httpd_manager_reports/OTP-11185' into maint-r15Erlang/OTP
* fredrik/inets/httpd_manager_reports/OTP-11185: inets: version updates inets: removed obsolete code
2013-06-28inets: version updatesFredrik Gustafsson
2013-06-28ssh: version updatesFredrik Gustafsson
2013-06-27ssh: fixed bad match failure when disconnect msgFredrik Gustafsson
2013-06-27inets: removed obsolete codeFredrik Gustafsson
2013-06-26readme: changed information about pull requestsFredrik Gustafsson
2013-06-26Merge branch 'nox/illegal-bitstring-gen-pattern/OTP-11186'Fredrik Gustafsson
* nox/illegal-bitstring-gen-pattern/OTP-11186: Bootstrap added Simplify v3_core's translation of bit string generators Forbid unsized fields in patterns of binary generators
2013-06-24Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-24Merge branch 'ia/public_key/test-independency' into maintIngela Anderton Andin
* ia/public_key/test-independency: public_key: Make test cases independent of failure of other test cases to clean up.
2013-06-24public_key: Make test cases independent of failure of other test casesIngela Anderton Andin
to clean up.
2013-06-20Merge branch 'maint'Sverker Eriksson
2013-06-20Merge branch 'sverk/crypto-remove-ec-resource' into maintSverker Eriksson
* sverk/crypto-remove-ec-resource: crypto: Supress some false positives from valgrind crypto: Refactor remove resource for EC_KEY crypto: Fix some compiler warnings
2013-06-20Merge branch 'maint'Sverker Eriksson
Conflicts: erts/vsn.mk lib/kernel/vsn.mk lib/stdlib/vsn.mk
2013-06-20Merge branch 'sverk/aoffcbf' into maintSverker Eriksson
* sverk/aoffcbf: erts: Make aoffcbf default when migration is enabled erts: Add new allocator strategy aoffcbf OTP-11174
2013-06-19erts: Make aoffcbf default when migration is enabledSverker Eriksson
2013-06-19erts: Add new allocator strategy aoffcbfSverker Eriksson
with better performance than aoffcaobf as we don't have to rearrange the search tree when there are blocks of equal size.
2013-06-19Update version numbers for R16B02 developmentMagnus Lidén
2013-06-18Merge tag 'OTP_R16B01'Björn-Egil Dahlberg
The R16B01 release Conflicts: lib/sasl/vsn.mk
2013-06-17Prepare releaseOTP_R16B01Erlang/OTP
2013-06-17Merge branch 'maint'Sverker Eriksson
2013-06-17Merge branch 'sverk/term_to_binary-memleak' into maintSverker Eriksson
* sverk/term_to_binary-memleak: erts: Fix memory leak in term_to_binary/2 with compressed option
2013-06-15Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam
2013-06-15Merge branch 'raimo/race-in-prim_inet-close/OTP-10497' into maintRaimo Niskanen
* raimo/race-in-prim_inet-close/OTP-10497: Improve solution
2013-06-15Improve solutionRaimo Niskanen
2013-06-14httpc: Allow content body in DELETE requestsJames Wheare
2013-06-14Merge branch 'maint'Anders Svensson
2013-06-14Merge branch 'anders/diameter/vendor_specific_function_clause/OTP-11165' ↵Anders Svensson
into maint * anders/diameter/vendor_specific_function_clause/OTP-11165: Fix list-valued Vendor-Specific-Application-Id config
2013-06-14erts: Fix memory leak in term_to_binary/2 with compressed optionSverker Eriksson
2013-06-13Fix list-valued Vendor-Specific-Application-Id configAnders Svensson
Commit f0a36c79 broke the handling of such configuration, resulting in a function clause error in diameter_capx if the list was not of length 3, and faulty extraction of application id's otherwise. Only record-valued config was properly interpreted.
2013-06-12Merge branch 'maint'Björn-Egil Dahlberg
2013-06-12Update copyright yearsBjörn-Egil Dahlberg
2013-06-12crypto: Supress some false positives from valgrindSverker Eriksson
2013-06-12Merge branch 'maint'Björn-Egil Dahlberg
2013-06-12Update preloaded modulesBjörn-Egil Dahlberg
2013-06-12Merge branch 'maint'Björn-Egil Dahlberg
2013-06-12Update primary bootstrap appup filesBjörn-Egil Dahlberg
2013-06-12Update primary bootstrapBjörn-Egil Dahlberg
2013-06-12crypto: Refactor remove resource for EC_KEYSverker Eriksson
The resource was not needed as it was never kept between external crypto calls.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 04:31:40 +0000