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

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Alexey Bychko
Approved revision: 892
Merge reported by: Hrvoje Matijakovic
Merged at revision: not available
Proposed branch: lp:~hrvojem/percona-xtradb-cluster/bld-195-pxc-5.6
Merge into: lp:percona-xtradb-cluster
Diff against target: 73 lines (+15/-24)
2 files modified
doc-pxc/source/installation/apt_repo.rst (+7/-7)
doc-pxc/source/installation/yum_repo.rst (+8/-17)
To merge this branch: bzr merge lp:~hrvojem/percona-xtradb-cluster/bld-195-pxc-5.6
Reviewer Review Type Date Requested Status
Alexey Bychko (community) Approve
Review via email: mp+235609@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Bychko (abychko) :
review: Needs Fixing
Revision history for this message
Alexey Bychko (abychko) :
review: Needs Fixing
892. By Hrvoje Matijakovic

Documented changes in yum repositories described in BLD-195

Revision history for this message
Alexey Bychko (abychko) wrote :

looks good, thank you

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-07-18 11:33:37 +0000
3+++ doc-pxc/source/installation/apt_repo.rst 2014-09-23 12:03:47 +0000
4@@ -56,13 +56,13 @@
5
6 Garbd is packaged separately as part of debian split packaging. The garbd debian package is ``percona-xtradb-cluster-garbd-3.x``. The package contains, garbd, daemon init script and related config files. This package will be installed if you install the ``percona-xtradb-cluster-56-full`` meta package.
7
8-Percona `apt` Experimental repository
9-=====================================
10-
11-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: ::
12-
13- deb http://repo.percona.com/apt VERSION main experimental
14- deb-src http://repo.percona.com/apt VERSION main experimental
15+Percona `apt` Testing repository
16+=================================
17+
18+Percona offers pre-release builds from the testing repository. To enable it add the following lines to your :file:`/etc/apt/sources.list` , replacing ``VERSION`` with the name of your distribution: ::
19+
20+ deb http://repo.percona.com/apt VERSION main testing
21+ deb-src http://repo.percona.com/apt VERSION main testing
22
23 Apt-Pinning the packages
24 ========================
25
26=== modified file 'doc-pxc/source/installation/yum_repo.rst'
27--- doc-pxc/source/installation/yum_repo.rst 2014-03-20 09:43:39 +0000
28+++ doc-pxc/source/installation/yum_repo.rst 2014-09-23 12:03:47 +0000
29@@ -11,20 +11,16 @@
30 Automatic Installation
31 =======================
32
33-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
34-
35- $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
36-
37-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
38+Execute the following command as a ``root`` user: ::
39+
40+ $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
41
42 You should see some output such as the following: ::
43
44- Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
45+ Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
46 Preparing... ########################################### [100%]
47 1:percona-release ########################################### [100%]
48
49-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
50-
51 Install XtraDB Cluster
52 =======================
53
54@@ -41,15 +37,10 @@
55 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.
56
57
58-Percona `yum` Experimental repository
59-=====================================
60-
61-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
62-
63- yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
64-
65-.. note::
66- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
67+Percona `yum` Testing repository
68+=================================
69+
70+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`. **NOTE:** You'll need to install the Percona repository first if this hasn't been done already.
71
72 Resolving package conflicts
73 ===========================

Subscribers

People subscribed via source and target branches