aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-07-09Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [sasl] Remove directory with unicode characters after successful test
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 'fredrik/fix_readme_pulls' into maintFredrik Gustafsson
* fredrik/fix_readme_pulls: readme: changed information about pull requests
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 '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-25[sasl] Remove directory with unicode characters after successful testSiri Hansen
This is to avoid lingering files after test runs on windows, since the cleanup script often does not succeed in removing files with unicode characters.
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 '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 '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-17Prepare releaseOTP_R16B01Erlang/OTP
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 '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 '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-12Update copyright yearsBjörn-Egil Dahlberg
2013-06-12crypto: Supress some false positives from valgrindSverker Eriksson
2013-06-12Update preloaded modulesBjö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.
2013-06-12crypto: Fix some compiler warningsSverker Eriksson
2013-06-12Merge branch 'rickard/+sfwi/OTP-11164' into maintRickard Green
* rickard/+sfwi/OTP-11164: erts: Add the +sfwi system flag
2013-06-12Merge branch 'sverk/crypto-upgrade-resource-bug' into maintSverker Eriksson
* sverk/crypto-upgrade-resource-bug: crypto: Fix bug with takover of EC resource type
2013-06-11erts: Add the +sfwi system flagRickard Green
+sfwi Interval Set scheduler forced wakeup interval. All run queues will be scanned each Interval milliseconds. While there are sleeping schedulers in the system, one scheduler will be woken for each non-empty run queue found. An Interval of zero disables this feature, which also is the default. This feature has been introduced as a temporary workaround for lengthy executing native code, and native code that do not bump reductions properly in OTP. When these bugs have be fixed the +sfwi flag will be removed.
2013-06-11crypto: Fix bug with takover of EC resource typeSverker Eriksson
enif_open_resource_type() must be called even during repeated loading of same library. Otherwise the resource type will be deallocated when the old module instance is purged.
2013-06-11Merge branch 'pan/happi/yield_in_term_to_binary' into maintOTP_R16B01_RC1Patrik Nyblom
* pan/happi/yield_in_term_to_binary: Add testcase to stress extra_root term_to_binary: Remove debug code and set production trap levels Teach erl_gc:offset_rootset about extra_root Teach external.c to handle reallocs before compression Make all steps ofterm_to_binary work in chunks and yield Make term_to_binary yield (trap). OTP-11163
2013-06-11Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson
* anders/diameter/request_spawn/OTP-11060: Minor doc fix
2013-06-11Minor doc fixAnders Svensson
2013-06-11Add testcase to stress extra_rootPatrik Nyblom
2013-06-11Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maintAnders Svensson
* anders/diameter/release/R16B01/OTP-11120: vsn -> 1.4.2 Update appup for R16B01 Trailing whitespace and copyright fixes Minor macro simplification Move app/appsrc from src/base into src
2013-06-11Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson
* anders/diameter/request_spawn/OTP-11060: Make spawn options for request processes configurable
2013-06-11Merge branch 'anders/diameter/peer_address_config/OTP-10893' into maintAnders Svensson
* anders/diameter/peer_address_config/OTP-10893: Let diameter_{tcp,sctp} be configured with permissible remote addresses Fix diameter_{tcp,sctp} spec Remove trailing whitespace
2013-06-10term_to_binary: Remove debug code and set production trap levelsPatrik Nyblom