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

Proposed by Hrvoje Matijakovic on 2014-09-23
Status: Merged
Approved by: Hrvoje Matijakovic on 2014-09-23
Approved revision: 618
Merged at revision: 624
Proposed branch: lp:~hrvojem/percona-server/doc-111-5.1
Merge into: lp:percona-server/5.1
Diff against target: 140 lines (+22/-41)
3 files modified
doc/source/installation.rst (+0/-2)
doc/source/installation/apt_repo.rst (+12/-8)
doc/source/installation/yum_repo.rst (+10/-31)
To merge this branch: bzr merge lp:~hrvojem/percona-server/doc-111-5.1
Reviewer Review Type Date Requested Status
Hrvoje Matijakovic Approve on 2014-09-23
Review via email: mp+235650@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 2013-03-21 20:28:50 +0000
3+++ doc/source/installation.rst 2014-09-23 14:32:43 +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:29:11 +0000
16+++ doc/source/installation/apt_repo.rst 2014-09-23 14:32:43 +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@@ -17,6 +17,10 @@
27
28 $ apt-get update
29
30+After that you can install the server and client packages ::
31+
32+ $ apt-get install percona-server-server-5.1 percona-server-client-5.1
33+
34 Supported Platforms
35 ===================
36
37@@ -38,13 +42,13 @@
38 * 12.04LTS (precise)
39 * 13.10 (saucy)
40
41-Percona `apt` Experimental repository
42-=====================================
43-
44-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: ::
45-
46- deb http://repo.percona.com/apt VERSION main experimental
47- deb-src http://repo.percona.com/apt VERSION main experimental
48+Percona `apt` Testing repository
49+=================================
50+
51+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: ::
52+
53+ deb http://repo.percona.com/apt VERSION main testing
54+ deb-src http://repo.percona.com/apt VERSION main testing
55
56 Apt-Pinning the packages
57 ========================
58
59=== modified file 'doc/source/installation/yum_repo.rst'
60--- doc/source/installation/yum_repo.rst 2014-06-04 15:26:51 +0000
61+++ doc/source/installation/yum_repo.rst 2014-09-23 14:32:43 +0000
62@@ -6,37 +6,21 @@
63
64 The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
65
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>`_. You can also do the installation manually.
67+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>`_.
68
69 Automatic Installation
70 ======================
71
72-Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::
73+Execute the following command as a ``root`` user: ::
74
75- $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
76+ $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
77
78 You should see some output such as the following: ::
79
80- Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm
81+ Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
82 Preparing... ########################################### [100%]
83 1:percona-release ########################################### [100%]
84
85-The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
86-
87-Manual Installation
88-===================
89-
90-To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: ::
91-
92- [percona]
93- name = CentOS $releasever - Percona
94- baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/
95- enabled = 1
96- gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona
97- gpgcheck = 1
98-
99-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`.
100-
101 Testing The Repository
102 ======================
103
104@@ -46,7 +30,7 @@
105
106 You should see output similar to the following: ::
107
108- percona-release.x86_64 0.0-1 @/percona-release-0.0-1.x86_64
109+ percona-release.noarch 0.1-3 @/percona-release-0.1-3.noarch
110 ...
111 Percona-Server-client-51.x86_64 5.1.73-rel14.11.603.rhel6 percona
112 Percona-Server-devel-51.x86_64 5.1.73-rel14.11.603.rhel6 percona
113@@ -54,7 +38,7 @@
114 Percona-Server-shared-51.x86_64 5.1.73-rel14.11.603.rhel6 percona
115 Percona-Server-test-51.x86_64 5.1.73-rel14.11.603.rhel6 percona
116 ...
117- percona-xtrabackup.x86_64 2.1.7-721.rhel6 percona
118+ percona-xtrabackup.x86_64 2.2.4-5004.el6 percona
119
120
121 Supported Platforms
122@@ -74,15 +58,10 @@
123
124 * *Amazon Linux AMI* (works the same as *CentOS* 5)
125
126-Percona `yum` Experimental repository
127-=====================================
128-
129-Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::
130-
131- yum install http://repo.percona.com/testing/centos/6/os/noarch/percona-testing-0.0-1.noarch.rpm
132-
133-.. note::
134- This repository works for both RHEL/CentOS 5 and RHEL/CentOS 6
135+Percona `yum` Testing repository
136+================================
137+
138+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.
139
140 .. rubric:: Footnotes
141

Subscribers

People subscribed via source and target branches