diff options
| author | Gustav Simonsson <[email protected]> | 2012-05-31 11:28:41 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-05-31 11:28:41 +0200 |
| commit | 570f71bd3e5c6ace878a0ec0ed64e09864410b32 (patch) | |
| tree | b1690b2013550247f72abab5f883500b9f01c882 /lib/os_mon/src/memsup.erl | |
| parent | 4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (diff) | |
| parent | 7a92687ec2b44353fef273a9e1e731f64c4a6d2e (diff) | |
| download | otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.gz otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.bz2 otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.zip | |
Merge branch 'gustav/os_mon/disksup_call_timeout/OTP-10100' into maint
* gustav/os_mon/disksup_call_timeout/OTP-10100:
Add infinity timeout to os_mon calls
Diffstat (limited to 'lib/os_mon/src/memsup.erl')
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 5ef240f128..54771b4703 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -112,7 +112,7 @@ get_helper_timeout() -> set_helper_timeout(Seconds) -> case param_type(memsup_helper_timeout, Seconds) of true -> - os_mon:call(memsup, {set_helper_timeout, Seconds}); + os_mon:call(memsup, {set_helper_timeout, Seconds}, infinity); false -> erlang:error(badarg) end. |