Merge lp:~hrvojem/percona-xtradb-cluster/small-formatting-fixes into lp:~raghavendra-prabhu/percona-xtradb-cluster/release-5.5.32-docs

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: 452
Merge reported by: Hrvoje Matijakovic
Merged at revision: not available
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/small-formatting-fixes
Merge into: lp:~raghavendra-prabhu/percona-xtradb-cluster/release-5.5.32-docs
Diff against target: 58 lines (+11/-8)
1 file modified
doc-pxc/source/manual/xtrabackup_sst.rst (+11/-8)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/small-formatting-fixes
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu Pending
Review via email: mp+173738@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Merged.

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Don't merge this into trunk yet, this has 5.5.32 PS merge, so I need to test this.

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Pushed to trunk as well.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc-pxc/source/manual/xtrabackup_sst.rst'
2--- doc-pxc/source/manual/xtrabackup_sst.rst 2013-07-09 14:13:22 +0000
3+++ doc-pxc/source/manual/xtrabackup_sst.rst 2013-07-09 14:51:25 +0000
4@@ -4,8 +4,8 @@
5 Xtrabackup SST Configuration
6 ===============================
7
8-* Following SST specific options are allowed in my.cnf under [sst]:
9-==========================
10+Following SST specific options are allowed in my.cnf under [sst]:
11+==================================================================
12
13 .. note::
14 In following options, non-integer options which have no default are
15@@ -19,7 +19,7 @@
16 :Match: Yes
17
18 You need to use xbstream for encryption, compression etc.,
19-however, lp:1193240 requires you to manually cleanup the
20+however, bug :bug:`1193240` requires you to manually cleanup the
21 directory prior to SST.
22
23 .. option:: transferfmt
24@@ -52,7 +52,9 @@
25
26 Decides whether encryption is to be done or not, if this is zero, no
27 encryption is done.
28+
29 * Xtrabackup based encryption
30+
31 * OpenSSL based encryption - socat must be built with openSSL for encryption: ```socat -V | grep OPENSSL```.
32
33 .. note::
34@@ -61,18 +63,19 @@
35
36 .. option:: sockopt
37
38-Comma separated key/value pairs of socket options. Must begin with
39-a comma. You can use tcpwrap option here to blacklist/whitelist the
40-clients. Refer to socat manual for further details.
41+Comma separated key/value pairs of socket options. Must begin with a comma. You can use tcpwrap option here to blacklist/whitelist the clients. Refer to socat manual for further details.
42
43-.. option progress::
44+.. option:: progress
45
46 :Values: 1,path-to-file,path-to-fifo
47
48 If equal to:
49+
50 * 1 it writes to mysql stderr
51 * path to file writes to that file
52- * path to a fifo, it will be created and cleaned up at exit.This is the preferred way. You need to cat the fifo file to monitor the progress, not tail it.
53+ * path to a fifo, it will be created and cleaned up at exit.This is the preferred way. You need to cat the fifo file to monitor the progress, not tail it.
54+
55+
56 Note: Value of 0 is not valid.
57
58 .. option:: rebuild

Subscribers

People subscribed via source and target branches