Merge lp:~hrvojem/percona-server/doc-111-5.5 into lp:percona-server/5.5

Proposed by Hrvoje Matijakovic on 2014-09-23
Status: Merged
Approved by: Hrvoje Matijakovic on 2014-09-23
Approved revision: 692
Merged at revision: 698
Proposed branch: lp:~hrvojem/percona-server/doc-111-5.5
Merge into: lp:percona-server/5.5
Diff against target: 139 lines (+19/-43)
3 files modified
doc/source/installation.rst (+0/-2)
doc/source/installation/apt_repo.rst (+9/-10)
doc/source/installation/yum_repo.rst (+10/-31)
To merge this branch: bzr merge lp:~hrvojem/percona-server/doc-111-5.5
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve on 2014-09-23
Review via email: mp+235654@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)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/installation.rst'
2--- doc/source/installation.rst 2014-03-25 12:07:45 +0000
3+++ doc/source/installation.rst 2014-09-23 14:55:51 +0000
4@@ -12,8 +12,6 @@
5
6 * *Debian* packages for *Debian* and *Ubuntu*
7
8-.. * *Microsoft Windows* binaries
9-
10 * Generic ``.tar.gz`` packages
11
12 Using Percona Software Repositories
13
14=== modified file 'doc/source/installation/apt_repo.rst'
15--- doc/source/installation/apt_repo.rst 2014-07-30 09:47:55 +0000
16+++ doc/source/installation/apt_repo.rst 2014-09-23 14:55:51 +0000
17@@ -4,7 +4,7 @@
18 Percona :program:`apt` Repository
19 ===================================
20
21-*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands: ::
22+*Debian* and *Ubuntu* packages from *Percona* are signed with a key. Before using the repository, you should add the key to :program:`apt`. To do that, run the following commands as root: ::
23
24 $ apt-key adv --keyserver keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
25
26@@ -19,8 +19,7 @@
27
28 After that you can install the server and client packages ::
29
30- # apt-get install percona-server-server-5.5 percona-server-client-5.5
31-
32+ $ apt-get install percona-server-server-5.5 percona-server-client-5.5
33
34 Supported Platforms
35 ===================
36@@ -45,13 +44,13 @@
37 * 13.10 (saucy)
38 * 14.04LTS (trusty)
39
40-Percona `apt` Experimental repository
41-=====================================
42-
43-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: ::
44-
45- deb http://repo.percona.com/apt VERSION main experimental
46- deb-src http://repo.percona.com/apt VERSION main experimental
47+Percona `apt` Testing repository
48+=================================
49+
50+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: ::
51+
52+ deb http://repo.percona.com/apt VERSION main testing
53+ deb-src http://repo.percona.com/apt VERSION main testing
54
55 Apt-Pinning the packages
56 ========================
57
58=== modified file 'doc/source/installation/yum_repo.rst'
59--- doc/source/installation/yum_repo.rst 2014-06-11 13:39:54 +0000
60+++ doc/source/installation/yum_repo.rst 2014-09-23 14:55:51 +0000
61@@ -6,37 +6,21 @@
62
63 The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
64
65-The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_. You can also do the installation manually.
66+The easiest way to install the *Percona Yum* repository is to install an *RPM* that configures :program:`yum` and installs the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_.
67
68 Automatic Installation
69 ======================
70
71-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
72+Execute the following command as a ``root`` user: ::
73
74- $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
75+ $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
76
77 You should see some output such as the following: ::
78
79- Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
80+ Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
81 Preparing... ########################################### [100%]
82 1:percona-release ########################################### [100%]
83
84-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
85-
86-Manual Installation
87-===================
88-
89-To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: ::
90-
91- [percona]
92- name = CentOS $releasever - Percona
93- baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/
94- enabled = 1
95- gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona
96- gpgcheck = 1
97-
98-Also, copy the `Percona GPG key <http://www.percona.com/downloads/RPM-GPG-KEY-percona>`_ into a file named :file:`/etc/pki/rpm-gpg/RPM-GPG-KEY-percona`.
99-
100 Testing The Repository
101 ======================
102
103@@ -46,7 +30,7 @@
104
105 You should see output similar to the following: ::
106
107- percona-release.x86_64 0.0-1 @/percona-release-0.0-1.x86_64
108+ percona-release.noarch 0.1-3 @/percona-release-0.1-3.noarch
109 ...
110 Percona-Server-client-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
111 Percona-Server-devel-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
112@@ -54,7 +38,7 @@
113 Percona-Server-shared-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
114 Percona-Server-test-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
115 ...
116- percona-xtrabackup.x86_64 2.1.7-721.rhel6 percona
117+ percona-xtrabackup.x86_64 2.2.4-5004.el6 percona
118
119
120 Supported Platforms
121@@ -74,15 +58,10 @@
122
123 * *Amazon Linux AMI* (works the same as *CentOS* 5)
124
125-Percona `yum` Experimental repository
126-=====================================
127-
128-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
129-
130- yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
131-
132-.. note::
133- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
134+Percona `yum` Testing repository
135+================================
136+
137+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.
138
139 .. rubric:: Footnotes
140

Subscribers

People subscribed via source and target branches