aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-29 14:40:58 +0200
committerZandra Hird <[email protected]>2015-05-29 14:40:58 +0200
commitcefae2f3a1934e9a6eb05c8b2b83ffc9ecc2bce9 (patch)
tree2afc8314a1a07ee674c99975ad16e93e839e270f
parent5889686cb7252e9019b88492726a1237d3e8566d (diff)
parent00c42c84995190ee97a021cce91287919efed1a4 (diff)
downloadotp-cefae2f3a1934e9a6eb05c8b2b83ffc9ecc2bce9.tar.gz
otp-cefae2f3a1934e9a6eb05c8b2b83ffc9ecc2bce9.tar.bz2
otp-cefae2f3a1934e9a6eb05c8b2b83ffc9ecc2bce9.zip
Merge branch 'ethercrow/maint'
* ethercrow/maint: Make cpu_sup:util/0 spec lie less
-rw-r--r--lib/os_mon/src/cpu_sup.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index 0c26956c57..b4ad8e2aa0 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -121,7 +121,7 @@ util(Args) when is_list (Args) ->
util(_) ->
erlang:error(badarg).
--spec util() -> float().
+-spec util() -> float() | {'error', any()}.
util() ->
case util([]) of