aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-08-23Merge branch 'maint-r15' into maint-r16Björn Gustavsson
Note that this is a fake merge. The bug fix changes files that are no longer present in maint, and the bug will need to be fixed in a different way. * maint-r15: Prepare release PER, UPER: Fix encoding/decoding of open types greater than 16K
2013-08-08Prepare releaseErlang/OTP
2013-08-08Merge branch 'bjorn/asn1/fragmented-open-types/OTP-11223' into maint-r15Erlang/OTP
* bjorn/asn1/fragmented-open-types/OTP-11223: PER, UPER: Fix encoding/decoding of open types greater than 16K
2013-08-08PER, UPER: Fix encoding/decoding of open types greater than 16KBjörn Gustavsson
2013-07-08Merge branch 'bmk/snmp/snmp4241_integration/r16' into maint-r16Erlang/OTP
* bmk/snmp/snmp4241_integration/r16: [snmp/agent] Cleanup, renaming, appup, proper version and release notes [snmp/agent] Local DB counter increment wrap error SNMP/VACM: bugfix for vacmViewTreeFamilyMask
2013-07-04Merge branch 'bmk/snmp/agent/ldb_counter_wrap/OTP-11192' into ↵Micael Karlberg
bmk/snmp/snmp4241_integration/r16 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2013-07-04Merge branch 'bmk/snmp/agent/fix_vacm_mask/OTP-11177' into ↵Micael Karlberg
bmk/snmp/snmp4241_integration/r16
2013-07-04[snmp/agent] Cleanup, renaming, appup, proper version and release notesMicael Karlberg
Add utility functions for checking view masks. Code cleanup, function renaming and comment fix (%% instead of %). Also updated the mask check in the vacm config file check function. Finally, release notes and some cosmetic changes to the agent config-file(s) user guide chapter.
2013-07-03[snmp/agent] Local DB counter increment wrap errorMicael Karlberg
The counter increment function in the local-db was incorrect. It did not handle counter wrap correctly. OTP-11192
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-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-24Merge branch 'sze/fix-vacm' into bmk/snmp/agent/fix_vacm_mask/OTP-11177Micael Karlberg
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-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-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-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
2013-06-10vsn -> 1.4.2Anders Svensson
2013-06-10Update appup for R16B01Anders Svensson
Tickets and corresponding runtime modules, in order merged: OTP-9610 (distribution) diameter diameter_config diameter_peer diameter_service diameter_traffic diameter_service must precede diameter_peer. OTP-10972 (app_not_configured) diameter diameter_config diameter_lib diameter_peer_fsm diameter_watchdog Load order is unimportant. OTP-11017 (service_config) diameter_config OTP-10986 (address_config) diameter_peer diameter_peer_fsm diameter_tcp diameter_tcp must follow the others. OTP-11019 (watchdog_leak) diameter_service OTP-11026 (avp_length_failure) diameter_codec OTP-11007 (avp_decode) diameter_gen.hrl => diameter_gen_* diameter_codec diameter_traffic diameter_traffic must precede diameter_gen_*. OTP-11087 (missed_5001) diameter_gen.hrl => diameter_gen_* OTP-11115 (watchdog_function_clause) diameter_watchdog OTP-11050 (inband_security) diameter_peer_fsm diameter_capx This order is required. OTP-11045 (host_ip_address) diameter_peer_fsm OTP-11092 (5xxx_failed_avp) diameter_traffic OTP-11127 (one_failed_avp) diameter_peer_fsm OTP-10893 (peer_address_config) diameter_peer diameter_tcp diameter_sctp diameter_peer must precede the others. OTP-11060 (request_spawn) diameter_service diameter_traffic diameter_config diameter diameter_traffic should precede diameter_service, diameter_config should follow. Tickets without code: OTP-10903 (examples_suite) OTP-11014 (release_notes) OTP-11051 (mkdir_race) OTP-10914 (timetraps)
2013-06-10Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green
* rickard-sverker/carrier-migration/OTP-10279: erts: Fix warning erts: Fix management of redirected carrier to deallocate
2013-06-10Make spawn options for request processes configurableAnders Svensson
That is, for the process that's spawned for each incoming Diameter request message.
2013-06-10Forgot ticket for sverk/darwin-unlimited-selectSverker Eriksson
OTP-11159
2013-06-10Merge branch 'sverk/darwin-unlimited-select' into maintSverker Eriksson
* sverk/darwin-unlimited-select: erts: Fix dynamic select for darwin erts: Refactor unlimited select patch erts: Fix bug in unlimited fd_set patch Use _DARWIN_UNLIMITED_SELECT in erl_poll
2013-06-10Merge branch 'ia/public_key/crypto/prepare-for-release' into maintIngela Anderton Andin
* ia/public_key/crypto/prepare-for-release: public_key & ssl: Add ASN-1 dependency crypto & public_key: prepare for release
2013-06-10Merge branch 'ia/crypto/avoid-too-big-binaries/OTP-11142' into maintIngela Anderton Andin
* ia/crypto/avoid-too-big-binaries/OTP-11142: Teach crypto.c not to call enif_compute_timeslice with 0 Add enif_consume_timeslice to appropriate crypto NIFs crypto: Add large test data crypto: Avoid big binaries in nifs Crypto: Structure code
2013-06-10Merge branch 'rickard/stale-driver-select/OTP-11084' into maintRickard Green
* rickard/stale-driver-select/OTP-11084: Fix bad fix of erts_stale_drv_select()