Merge lp:~hrvojem/percona-xtradb-cluster/bld-195-pxc-5.5 into lp:percona-xtradb-cluster/5.5

Proposed by Hrvoje Matijakovic on 2014-09-23
Status: Merged
Approved by: Hrvoje Matijakovic on 2014-09-23
Approved revision: 829
Merged at revision: 829
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/bld-195-pxc-5.5
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 90 lines (+25/-23)
2 files modified
doc-pxc/source/installation/apt_repo.rst (+15/-5)
doc-pxc/source/installation/yum_repo.rst (+10/-18)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/bld-195-pxc-5.5
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve on 2014-09-23
Review via email: mp+235672@code.launchpad.net
To post a comment you must log in.
Hrvoje Matijakovic (hrvojem) wrote :

self-approved (already reviewed and approved by AlexeyB for PXC-5.6)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc-pxc/source/installation/apt_repo.rst'
--- doc-pxc/source/installation/apt_repo.rst 2014-08-27 15:38:50 +0000
+++ doc-pxc/source/installation/apt_repo.rst 2014-09-23 16:36:24 +0000
@@ -37,7 +37,6 @@
3737
38 * 10.04LTS lucid38 * 10.04LTS lucid
39 * 12.04LTS precise39 * 12.04LTS precise
40 * 13.04 raring
41 * 13.10 saucy40 * 13.10 saucy
42 * 14.04LTS trusty41 * 14.04LTS trusty
4342
@@ -61,10 +60,21 @@
61 60
62 Garbd is packaged separately as part of debian split packaging. The garbd debian package is ``percona-xtradb-cluster-garbd-2.x``. The package contains, garbd, daemon init script and related config files. This package will be installed if you install the ``percona-xtradb-cluster-full-55`` meta package.61 Garbd is packaged separately as part of debian split packaging. The garbd debian package is ``percona-xtradb-cluster-garbd-2.x``. The package contains, garbd, daemon init script and related config files. This package will be installed if you install the ``percona-xtradb-cluster-full-55`` meta package.
6362
64Percona `apt` Experimental repository63Percona `apt` Testing repository
65=====================================64================================
6665
67Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: ::66Percona offers fresh beta builds from the experimental repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: ::
6867
69 deb http://repo.percona.com/apt VERSION main experimental68 deb http://repo.percona.com/apt VERSION main testing
70 deb-src http://repo.percona.com/apt VERSION main experimental69 deb-src http://repo.percona.com/apt VERSION main testing
70
71Apt-Pinning the packages
72========================
73
74In some cases you might need to "pin" the selected packages to avoid the upgrades from the distribution repositories. You'll need to make a new file :file:`/etc/apt/preferences.d/00percona.pref` and add the following lines in it: ::
75
76 Package: *
77 Pin: release o=Percona Development Team
78 Pin-Priority: 1001
79
80For more information about the pinning you can check the official `debian wiki <http://wiki.debian.org/AptPreferences>`_.
7181
=== modified file 'doc-pxc/source/installation/yum_repo.rst'
--- doc-pxc/source/installation/yum_repo.rst 2014-09-05 12:32:34 +0000
+++ doc-pxc/source/installation/yum_repo.rst 2014-09-23 16:36:24 +0000
@@ -6,25 +6,21 @@
66
7The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.7The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
88
9The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <https://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. Installation can also be done manually.9The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <https://www.percona.com/downloads/RPM-GPG-KEY-percona>`_.
1010
11Automatic Installation11Automatic Installation
12=======================12=======================
1313
14Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::14Execute the following command as a ``root`` user: ::
1515
16 $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm16 $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
17
18The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
1917
20You should see some output such as the following: ::18You should see some output such as the following: ::
2119
22 Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm20 Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
23 Preparing... ########################################### [100%]21 Preparing... ########################################### [100%]
24 1:percona-release ########################################### [100%]22 1:percona-release ########################################### [100%]
2523
26The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
27
28Resolving package conflicts24Resolving package conflicts
29===========================25===========================
3026
@@ -44,12 +40,8 @@
44 In order to sucessfully install |Percona XtraDB Cluster| ``socat`` package will need to be installed first. ``socat`` package can be installed from the `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.40 In order to sucessfully install |Percona XtraDB Cluster| ``socat`` package will need to be installed first. ``socat`` package can be installed from the `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.
4541
4642
47Percona `yum` Experimental repository43Percona `yum` Testing repository
48=====================================44================================
4945
50Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::46Percona offers pre-release builds from the testing repository. To subscribe to the testing repository, you'll need to enable the testing repository in :file:`/etc/yum.repos.d/percona-release.repo` (both ``$basearch`` and ``noarch``). **NOTE:** You'll need to install the Percona repository first if this hasn't been done already.
5147
52 rpm -Uhv http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
53
54.. note::
55 This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6

Subscribers

People subscribed via source and target branches