diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-03 18:59:40 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-11-03 18:59:40 +0000 |
commit | d210a5a143ce26f18ac433e96addb9109b2ae137 (patch) | |
tree | 6e2598015ba97c7bc302655bd728fc60594783d3 | |
parent | 3971f9556d7f6fc3fcf68a8020d99033b0569604 (diff) | |
parent | 5799e00f8f113cfa233a4af23091bff62714b2da (diff) | |
download | gitlab-ce-d210a5a143ce26f18ac433e96addb9109b2ae137.tar.gz |
Merge branch 'fix-inline-doc' into 'master'
Fix Gitlab::Metrics::System#real_time and #monotonic_time doc
See merge request gitlab-org/gitlab-ce!15187
-rw-r--r-- | lib/gitlab/metrics/system.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb index aba3e0df382..c2cbd3c16a1 100644 --- a/lib/gitlab/metrics/system.rb +++ b/lib/gitlab/metrics/system.rb @@ -46,14 +46,14 @@ module Gitlab # Returns the current real time in a given precision. # - # Returns the time as a Float. + # Returns the time as a Fixnum. def self.real_time(precision = :millisecond) Process.clock_gettime(Process::CLOCK_REALTIME, precision) end # Returns the current monotonic clock time in a given precision. # - # Returns the time as a Float. + # Returns the time as a Fixnum. def self.monotonic_time(precision = :millisecond) Process.clock_gettime(Process::CLOCK_MONOTONIC, precision) end |