aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-02Merge branch 'maint-r15' into maint-r16Patrik Nyblom
2013-04-26Prepare releaseErlang/OTP
2013-04-26Merge branch 'pan/monitor_long_schedule' into maint-r15Erlang/OTP
* pan/monitor_long_schedule: Skip testcase on platforms w/o pipes/usleep Add documentation for new system_monitor Add long_schedule detection for ports and testcases Add erlang:system_monitor(Pid,[{long_schedule,Millis}])
2013-04-26Skip testcase on platforms w/o pipes/usleepPatrik Nyblom
2013-04-25Add documentation for new system_monitorPatrik Nyblom
2013-04-25Add long_schedule detection for ports and testcasesPatrik Nyblom
2013-04-19Add erlang:system_monitor(Pid,[{long_schedule,Millis}])Patrik Nyblom
2013-04-18Merge branch 'maint-r15' into maint-r16Björn Gustavsson
* maint-r15: Prepare release Dummy merge.
2013-04-18Prepare releaseErlang/OTP
2013-04-18Merge branch 'rickard/sched/OTP-11022' into maint-r16Erlang/OTP
* rickard/sched/OTP-11022: Do not count offline run-queues as empty
2013-04-18Prepare releaseErlang/OTP
2013-04-16Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r16Erlang/OTP
* bjorn/asn1/fix-lost-extension-mark/OTP-10995: Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
2013-04-16Do not count offline run-queues as emptyRickard Green
2013-04-15Prepare releaseErlang/OTP
2013-04-15Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r15Erlang/OTP
* bjorn/asn1/fix-lost-extension-mark/OTP-10995: Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
2013-04-04Prepare releaseErlang/OTP
2013-04-04Merge branch 'egil/r16/fix-delete_element/OTP-10932' into maint-r16Erlang/OTP
* egil/r16/fix-delete_element/OTP-10932: erts: Refactor erlang:insert_element/3 for clarity erts: Fix copy error in erlang:delete_element/2
2013-04-04Merge branch 'rickard/sys-flags/OTP-11000' into maint-r16Erlang/OTP
* rickard/sys-flags/OTP-11000: Fix `+sws' and `+swt' system flags
2013-04-04Merge branch 'rickard/thr_prgr_later_op/OTP-10994' into maint-r16Erlang/OTP
* rickard/thr_prgr_later_op/OTP-10994: Make port close not be delayed Be less eager requesting wakeup for cleanup jobs
2013-04-04Merge branch 'rickard/is_process_alive/OTP-10926' into maint-r16Erlang/OTP
* rickard/is_process_alive/OTP-10926: Fix erlang:is_process_alive/1
2013-04-04Make port close not be delayedPatrik Nyblom
Drivers are dereferenced when the port is completely gone, in the operation scheduled with erts_schedule_thr_prgr_later_op. If we use erts_schedule_thr_prgr_later_cleanup_op, it may not happen for a long time and the driver can not be unloaded. We can not dereference the driver before the thread_progress_later thing, because references to the driver may exist in other threads, so the unloading of the driver may free locks held by other schedulers and whatnot.
2013-04-03Fix `+sws' and `+swt' system flagsRickard Green
2013-04-03Be less eager requesting wakeup for cleanup jobsRickard Green
2013-04-03Prevent loss of objects after the extension markerBjörn Gustavsson
In an object set with a single root object, objects after the extension marker would be lost.
2013-04-03Don't lose the extension mark for object set parametersBjörn Gustavsson
When an object set is an actual parameter, the extension marker for the object set could get lost.
2013-03-22Merge branch 'lars/orber/corbaloc-bug-r16-version/OTP-10675' into maint-r16Erlang/OTP
* lars/orber/corbaloc-bug-r16-version/OTP-10675: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-21Merge branch 'maint-r15' into lars/orber/corbaloc-bug-r16-version/OTP-10675Lars Thorsen
* maint-r15: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'anders/diameter/vendor_specific_app_id/OTP-10942' into maint-r16Anders Svensson
* anders/diameter/vendor_specific_app_id/OTP-10942: Minor capx suite fix Update appup, vsn -> 1.4.1.1 Deal with RFC 6733 change to Vendor-Specific-Application-Id
2013-03-19Merge branch 'anders/diameter/reopen_abuse/OTP-10898' into maint-r16Anders Svensson
* anders/diameter/reopen_abuse/OTP-10898: Update appup Tweak okay -> suspect config Add testcases for watchdog_config Rework watchdog suite to remove most timing dependencies Rework stats to avoid concurrent read and write Minor spec fix Add transport_opt() watchdog_config
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'fredrik/ssh/timing_rekey/OTP-10940' into maint-r16Anders Svensson
* fredrik/ssh/timing_rekey/OTP-10940: Removed timing rekeying
2013-03-19Minor capx suite fixAnders Svensson
2013-03-18Update appup, vsn -> 1.4.1.1Anders Svensson
2013-03-18Deal with RFC 6733 change to Vendor-Specific-Application-IdAnders Svensson
RFC 6733 has changed the arity of Vendor-Id in this Grouped AVP, from 1* in RFC 3588 to 1 in RFC 6773. This impacts the generated dictionary modules: Vendor-Id is expected to be list-valued in the 3588 dictionary, integer-valued in the 6733 dictionary. This, in turn, breaks the independence of capabilities configuration on a service or transport from the dictionary that will be used to encode an outgoing CER or CEA. This commit fixes this by massaging any Vendor-Specific-Application-Id config as appropriate when constructing CER or CEA for a given dictionary.
2013-03-18Update appupAnders Svensson
2013-03-18Merge branch 'lars/orber/corbaloc-bug/OTP-10675' into maint-r15Erlang/OTP
* lars/orber/corbaloc-bug/OTP-10675: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-18[orber] Fix bug in corbaloc/corbaname over sslLars Thorsen
2013-03-14Removed timing rekeyingFredrik Gustafsson
2013-03-13Prepare releaseErlang/OTP
2013-03-13Merge branch 'bjorn/asn1/per-decode/OTP-10916' into maint-r16Erlang/OTP
* bjorn/asn1/per-decode/OTP-10916: PER: Ensure that the complete encoding is at least one byte PER/UPER: Correct decoding of ENUMERATEDs with a single value
2013-03-12Tweak okay -> suspect configAnders Svensson
Make it just a number of timeouts, without a new DWR being sent.
2013-03-12Add testcases for watchdog_configAnders Svensson
2013-03-12erts: Refactor erlang:insert_element/3 for clarityBjörn-Egil Dahlberg
2013-03-12erts: Fix copy error in erlang:delete_element/2Björn-Egil Dahlberg
Off-by-one error in element copy.
2013-03-12PER: Ensure that the complete encoding is at least one byteBjörn Gustavsson
If the encoding is empty (i.e. if a top-level type is single-valued and therefore not encoding), the result should be a single zero byte.
2013-03-12Fix erlang:is_process_alive/1Rickard Green
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed appup for 2.1.5 Conflicts: lib/ssh/src/ssh.appup.src
2013-03-08Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into ↵Erlang/OTP
maint-r16 * ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714: ssh: Prepare for upcoming release ssh: Test and enhance handling of nonexistent subsystem Prepare release Fixed rekeying initiation and secured testcase
2013-03-08Merge branch 'sverk/erl_interface-trailing-enum-comma' into maint-r16Erlang/OTP
* sverk/erl_interface-trailing-enum-comma: erl_interface: Remove superfluous comma in enum erlang_char_encoding