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
=== modified file 'doc-pxc/source/manual/xtrabackup_sst.rst'
--- doc-pxc/source/manual/xtrabackup_sst.rst 2013-07-09 14:13:22 +0000
+++ doc-pxc/source/manual/xtrabackup_sst.rst 2013-07-09 14:51:25 +0000
@@ -4,8 +4,8 @@
4 Xtrabackup SST Configuration4 Xtrabackup SST Configuration
5===============================5===============================
66
7* Following SST specific options are allowed in my.cnf under [sst]: 7Following SST specific options are allowed in my.cnf under [sst]:
8==========================8==================================================================
9 9
10.. note:: 10.. note::
11 In following options, non-integer options which have no default are11 In following options, non-integer options which have no default are
@@ -19,7 +19,7 @@
19 :Match: Yes19 :Match: Yes
2020
21You need to use xbstream for encryption, compression etc., 21You need to use xbstream for encryption, compression etc.,
22however, lp:1193240 requires you to manually cleanup the 22however, bug :bug:`1193240` requires you to manually cleanup the
23directory prior to SST.23directory prior to SST.
24 24
25.. option:: transferfmt25.. option:: transferfmt
@@ -52,7 +52,9 @@
5252
53Decides whether encryption is to be done or not, if this is zero, no 53Decides whether encryption is to be done or not, if this is zero, no
54encryption is done. 54encryption is done.
55
55 * Xtrabackup based encryption 56 * Xtrabackup based encryption
57
56 * OpenSSL based encryption - socat must be built with openSSL for encryption: ```socat -V | grep OPENSSL```. 58 * OpenSSL based encryption - socat must be built with openSSL for encryption: ```socat -V | grep OPENSSL```.
5759
58.. note::60.. note::
@@ -61,18 +63,19 @@
61 63
62.. option:: sockopt64.. option:: sockopt
6365
64Comma separated key/value pairs of socket options. Must begin with 66Comma 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.
65a comma. You can use tcpwrap option here to blacklist/whitelist the
66clients. Refer to socat manual for further details.
6767
68.. option progress::68.. option:: progress
6969
70 :Values: 1,path-to-file,path-to-fifo70 :Values: 1,path-to-file,path-to-fifo
7171
72If equal to:72If equal to:
73
73 * 1 it writes to mysql stderr 74 * 1 it writes to mysql stderr
74 * path to file writes to that file 75 * path to file writes to that file
75 * 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. 76 * 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.
77
78
76Note: Value of 0 is not valid.79Note: Value of 0 is not valid.
77 80
78.. option:: rebuild81.. option:: rebuild

Subscribers

People subscribed via source and target branches