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
1=== modified file 'doc-pxc/source/installation/apt_repo.rst'
2--- doc-pxc/source/installation/apt_repo.rst 2014-08-27 15:38:50 +0000
3+++ doc-pxc/source/installation/apt_repo.rst 2014-09-23 16:36:24 +0000
4@@ -37,7 +37,6 @@
5
6 * 10.04LTS lucid
7 * 12.04LTS precise
8- * 13.04 raring
9 * 13.10 saucy
10 * 14.04LTS trusty
11
12@@ -61,10 +60,21 @@
13
14 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.
15
16-Percona `apt` Experimental repository
17-=====================================
18+Percona `apt` Testing repository
19+================================
20
21 Percona 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: ::
22
23- deb http://repo.percona.com/apt VERSION main experimental
24- deb-src http://repo.percona.com/apt VERSION main experimental
25+ deb http://repo.percona.com/apt VERSION main testing
26+ deb-src http://repo.percona.com/apt VERSION main testing
27+
28+Apt-Pinning the packages
29+========================
30+
31+In 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: ::
32+
33+ Package: *
34+ Pin: release o=Percona Development Team
35+ Pin-Priority: 1001
36+
37+For more information about the pinning you can check the official `debian wiki <http://wiki.debian.org/AptPreferences>`_.
38
39=== modified file 'doc-pxc/source/installation/yum_repo.rst'
40--- doc-pxc/source/installation/yum_repo.rst 2014-09-05 12:32:34 +0000
41+++ doc-pxc/source/installation/yum_repo.rst 2014-09-23 16:36:24 +0000
42@@ -6,25 +6,21 @@
43
44 The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
45
46-The 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.
47+The 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>`_.
48
49 Automatic Installation
50 =======================
51
52-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
53-
54- $ rpm -Uhv http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
55-
56-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
57+Execute the following command as a ``root`` user: ::
58+
59+ $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
60
61 You should see some output such as the following: ::
62
63- Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
64+ Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
65 Preparing... ########################################### [100%]
66 1:percona-release ########################################### [100%]
67
68-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
69-
70 Resolving package conflicts
71 ===========================
72
73@@ -44,12 +40,8 @@
74 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.
75
76
77-Percona `yum` Experimental repository
78-=====================================
79-
80-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
81-
82- rpm -Uhv http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
83-
84-.. note::
85- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
86+Percona `yum` Testing repository
87+================================
88+
89+Percona 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.
90+

Subscribers

People subscribed via source and target branches