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

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

Subscribers

People subscribed via source and target branches