Merge lp:~hrvojem/percona-server/bug921570 into lp:percona-server/5.5

Proposed by Hrvoje Matijakovic on 2012-01-25
Status: Merged
Approved by: Alexey Kopytov on 2012-01-26
Approved revision: 209
Merged at revision: 209
Proposed branch: lp:~hrvojem/percona-server/bug921570
Merge into: lp:percona-server/5.5
Diff against target: 44 lines (+6/-3)
2 files modified
doc/source/development.rst (+4/-1)
doc/source/diagnostics/user_stats.rst (+2/-2)
To merge this branch: bzr merge lp:~hrvojem/percona-server/bug921570
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-01-25 Approve on 2012-01-26
Review via email: mp+90127@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

OK to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/development.rst'
2--- doc/source/development.rst 2011-10-14 01:06:03 +0000
3+++ doc/source/development.rst 2012-01-25 15:00:20 +0000
4@@ -15,7 +15,7 @@
5 (allowing for a release at any time) and minimizing wasted time by
6 developers due to broken code from somebody else interfering with their day.
7
8-You should also be familiar with our :ref:`Jenkins` setup.
9+You should also be familiar with our :ref:`Jenkin` setup.
10
11 Overview
12 ~~~~~~~~
13@@ -163,6 +163,9 @@
14 This way anybody can easily check out an old release by just using bzr
15 to branch the specific tag.
16
17+
18+.. _Jenkin:
19+
20 Jenkins
21 =======
22
23
24=== modified file 'doc/source/diagnostics/user_stats.rst'
25--- doc/source/diagnostics/user_stats.rst 2011-10-07 23:38:41 +0000
26+++ doc/source/diagnostics/user_stats.rst 2012-01-25 15:00:20 +0000
27@@ -48,7 +48,7 @@
28 :column CONCURRENT_CONNECTIONS: The number of concurrent connections for this client.
29 :column CONNECTED_TIME: The cumulative number of seconds elapsed while there were connections from this client.
30 :column BUSY_TIME: The cumulative number of seconds there was activity on connections from this client.
31- :column CPU_TIME: The cumulative CPU time elapsed while servicing this client``s connections.
32+ :column CPU_TIME: The cumulative CPU time elapsed, in seconds, while servicing this client``s connections.
33 :column BYTES_RECEIVED: The number of bytes received from this client's connections.
34 :column BYTES_SENT: The number of bytes sent to this client's connections.
35 :column BINLOG_BYTES_WRITTEN: The number of bytes written to the binary log from this client's connections.
36@@ -169,7 +169,7 @@
37 :column CONCURRENT_CONNECTIONS: The number of concurrent connections for this user.
38 :column CONNECTED_TIME: The cumulative number of seconds elapsed while there were connections from this user.
39 :column BUSY_TIME: The cumulative number of seconds there was activity on connections from this user.
40- :column CPU_TIME: The cumulative CPU time elapsed while servicing this user's connections.
41+ :column CPU_TIME: The cumulative CPU time elapsed, in seconds, while servicing this user's connections.
42 :column BYTES_RECEIVED: The number of bytes received from this user's connections.
43 :column BYTES_SENT: The number of bytes sent to this user's connections.
44 :column BINLOG_BYTES_WRITTEN: The number of bytes written to the binary log from this user's connections.

Subscribers

People subscribed via source and target branches