Merge lp:~hrvojem/percona-xtradb-cluster/bug1275814-5.6 into lp:percona-xtradb-cluster

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: 889
Merge reported by: Hrvoje Matijakovic
Merged at revision: not available
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/bug1275814-5.6
Merge into: lp:percona-xtradb-cluster
Diff against target: 24 lines (+3/-2)
2 files modified
doc-pxc/source/conf.py (+2/-2)
doc-pxc/source/limitation.rst (+1/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/bug1275814-5.6
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu Pending
Review via email: mp+233366@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc-pxc/source/conf.py'
--- doc-pxc/source/conf.py 2014-07-18 11:33:37 +0000
+++ doc-pxc/source/conf.py 2014-09-04 14:38:35 +0000
@@ -53,9 +53,9 @@
53# built documents.53# built documents.
54#54#
55# The short X.Y version.55# The short X.Y version.
56version = '5.6.19'56version = '5.6.20'
57# The full version, including alpha/beta/rc tags.57# The full version, including alpha/beta/rc tags.
58release = '5.6.19-25.6'58release = '5.6.20-25.7'
5959
60# The language for content autogenerated by Sphinx. Refer to documentation60# The language for content autogenerated by Sphinx. Refer to documentation
61# for a list of supported languages.61# for a list of supported languages.
6262
=== modified file 'doc-pxc/source/limitation.rst'
--- doc-pxc/source/limitation.rst 2014-03-20 09:43:39 +0000
+++ doc-pxc/source/limitation.rst 2014-09-04 14:38:35 +0000
@@ -27,3 +27,4 @@
2727
28 - The minimal recommended size of cluster is 3 nodes.28 - The minimal recommended size of cluster is 3 nodes.
2929
30 - To enable Query Cache, node should be started with :variable:`query_cache_type` set to ``1`` and :variable:`query_cache_size` set to ``0``. After the node has been successfully started :variable:`query_cache_size` can be changed to desired value during the runtime.

Subscribers

People subscribed via source and target branches