Merge lp:~hrvojem/percona-server/bug1381438-5.6 into lp:percona-server/5.6

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 681
Proposed branch: lp:~hrvojem/percona-server/bug1381438-5.6
Merge into: lp:percona-server/5.6
Diff against target: 11 lines (+1/-1)
1 file modified
doc/source/diagnostics/scalability_metrics_plugin.rst (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug1381438-5.6
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve
Review via email: mp+238560@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/diagnostics/scalability_metrics_plugin.rst'
--- doc/source/diagnostics/scalability_metrics_plugin.rst 2014-05-06 12:43:39 +0000
+++ doc/source/diagnostics/scalability_metrics_plugin.rst 2014-10-16 13:33:09 +0000
@@ -55,7 +55,7 @@
55 :version 5.6.17-65.0: Implemented55 :version 5.6.17-65.0: Implemented
56 :vartype: Numeric56 :vartype: Numeric
5757
58This status variable shows total time elapsed since metrics collection was started.58This status variable shows total time elapsed, in microseconds, since metrics collection was started.
5959
60.. variable:: scalability_metrics_queries60.. variable:: scalability_metrics_queries
61 61

Subscribers

People subscribed via source and target branches