Merge lp:~hrvojem/percona-xtradb-cluster/trusty-metapackage-note-5.5 into lp:percona-xtradb-cluster/5.5

Proposed by Hrvoje Matijakovic on 2014-05-08
Status: Merged
Merged at revision: 759
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/trusty-metapackage-note-5.5
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 31 lines (+8/-2)
2 files modified
doc-pxc/source/faq.rst (+2/-2)
doc-pxc/source/installation.rst (+6/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/trusty-metapackage-note-5.5
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Pending
Review via email: mp+218847@code.launchpad.net
To post a comment you must log in.
Hrvoje Matijakovic (hrvojem) wrote :

trivial merge - self-approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc-pxc/source/faq.rst'
2--- doc-pxc/source/faq.rst 2014-05-08 13:22:53 +0000
3+++ doc-pxc/source/faq.rst 2014-05-08 17:06:24 +0000
4@@ -119,8 +119,8 @@
5
6 apt-get install percona-xtradb-cluster-galera-3.x
7
8-For centos, you will need to install yum replace `plugin<https://iuscommunity.org/pages/IUSClientUsageGuide.html>`_. After this, doing following will work:
9+For centos, you will need to install yum replace `plugin <https://iuscommunity.org/pages/IUSClientUsageGuide.html>`_. After this, doing following will work:
10
11-.. code-block:: shell
12+.. code-block:: bash
13
14 yum replace Percona-XtraDB-Cluster-galera-3 --replace-with Percona-XtraDB-Cluster-galera-2
15
16=== modified file 'doc-pxc/source/installation.rst'
17--- doc-pxc/source/installation.rst 2014-05-08 07:51:46 +0000
18+++ doc-pxc/source/installation.rst 2014-05-08 17:06:24 +0000
19@@ -44,6 +44,12 @@
20
21 $ sudo apt-get install percona-xtradb-cluster-55
22
23+.. note::
24+
25+ For Ubuntu 14.04 (Trusty) ``percona-xtradb-cluster-galera-2.x`` will have to be specified with the meta package so the installation command should look like: ::
26+
27+ $ sudo apt-get install percona-xtradb-cluster-55 percona-xtradb-cluster-galera-2.x
28+
29 More detailed example of the |Percona XtraDB Cluster| installation and configuration can be seen in :ref:`ubuntu_howto` tutorial.
30
31 Prerequisites

Subscribers

People subscribed via source and target branches