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

Proposed by Hrvoje Matijakovic
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
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
Review via email: mp+235654@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'doc/source/installation.rst'
--- doc/source/installation.rst 2014-03-25 12:07:45 +0000
+++ doc/source/installation.rst 2014-09-23 14:55:51 +0000
@@ -12,8 +12,6 @@
1212
13 * *Debian* packages for *Debian* and *Ubuntu*13 * *Debian* packages for *Debian* and *Ubuntu*
1414
15.. * *Microsoft Windows* binaries
16
17 * Generic ``.tar.gz`` packages15 * Generic ``.tar.gz`` packages
1816
19Using Percona Software Repositories17Using Percona Software Repositories
2018
=== modified file 'doc/source/installation/apt_repo.rst'
--- doc/source/installation/apt_repo.rst 2014-07-30 09:47:55 +0000
+++ doc/source/installation/apt_repo.rst 2014-09-23 14:55:51 +0000
@@ -4,7 +4,7 @@
4 Percona :program:`apt` Repository4 Percona :program:`apt` Repository
5===================================5===================================
66
7*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: ::7*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: ::
88
9 $ apt-key adv --keyserver keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A9 $ apt-key adv --keyserver keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
1010
@@ -19,8 +19,7 @@
1919
20After that you can install the server and client packages :: 20After that you can install the server and client packages ::
2121
22 # apt-get install percona-server-server-5.5 percona-server-client-5.522 $ apt-get install percona-server-server-5.5 percona-server-client-5.5
23
2423
25Supported Platforms24Supported Platforms
26===================25===================
@@ -45,13 +44,13 @@
45 * 13.10 (saucy)44 * 13.10 (saucy)
46 * 14.04LTS (trusty)45 * 14.04LTS (trusty)
4746
48Percona `apt` Experimental repository47Percona `apt` Testing repository
49=====================================48=================================
5049
51Percona 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: :: 50Percona 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: ::
5251
53 deb http://repo.percona.com/apt VERSION main experimental52 deb http://repo.percona.com/apt VERSION main testing
54 deb-src http://repo.percona.com/apt VERSION main experimental53 deb-src http://repo.percona.com/apt VERSION main testing
5554
56Apt-Pinning the packages55Apt-Pinning the packages
57========================56========================
5857
=== modified file 'doc/source/installation/yum_repo.rst'
--- doc/source/installation/yum_repo.rst 2014-06-11 13:39:54 +0000
+++ doc/source/installation/yum_repo.rst 2014-09-23 14:55:51 +0000
@@ -6,37 +6,21 @@
66
7The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.7The |Percona| :program:`yum` repository supports popular *RPM*-based operating systems, including the *Amazon Linux AMI*.
88
9The 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.9The 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>`_.
1010
11Automatic Installation11Automatic Installation
12======================12======================
1313
14Execute the following command as a ``root`` user, replacing ``x86_64`` with ``i386`` if you are not running a 64-bit operating system: ::14Execute the following command as a ``root`` user: ::
1515
16 $ yum install http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm16 $ yum install http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
1717
18You should see some output such as the following: ::18You should see some output such as the following: ::
1919
20 Retrieving http://www.percona.com/downloads/percona-release/percona-release-0.0-1.x86_64.rpm20 Retrieving http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm
21 Preparing... ########################################### [100%]21 Preparing... ########################################### [100%]
22 1:percona-release ########################################### [100%]22 1:percona-release ########################################### [100%]
2323
24The RPMs for the automatic installation are available at http://www.percona.com/downloads/percona-release/ and include source code.
25
26Manual Installation
27===================
28
29To install the repository manually, place the following into a new file named :file:`/etc/yum.repos.d/Percona.repo`: ::
30
31 [percona]
32 name = CentOS $releasever - Percona
33 baseurl=http://repo.percona.com/centos/$releasever/os/$basearch/
34 enabled = 1
35 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-percona
36 gpgcheck = 1
37
38Also, 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`.
39
40Testing The Repository24Testing The Repository
41======================25======================
4226
@@ -46,7 +30,7 @@
4630
47You should see output similar to the following: ::31You should see output similar to the following: ::
4832
49 percona-release.x86_64 0.0-1 @/percona-release-0.0-1.x86_6433 percona-release.noarch 0.1-3 @/percona-release-0.1-3.noarch
50 ...34 ...
51 Percona-Server-client-55.x86_64 5.5.35-rel33.0.611.rhel6 percona35 Percona-Server-client-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
52 Percona-Server-devel-55.x86_64 5.5.35-rel33.0.611.rhel6 percona36 Percona-Server-devel-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
@@ -54,7 +38,7 @@
54 Percona-Server-shared-55.x86_64 5.5.35-rel33.0.611.rhel6 percona38 Percona-Server-shared-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
55 Percona-Server-test-55.x86_64 5.5.35-rel33.0.611.rhel6 percona39 Percona-Server-test-55.x86_64 5.5.35-rel33.0.611.rhel6 percona
56 ...40 ...
57 percona-xtrabackup.x86_64 2.1.7-721.rhel6 percona41 percona-xtrabackup.x86_64 2.2.4-5004.el6 percona
5842
5943
60Supported Platforms44Supported Platforms
@@ -74,15 +58,10 @@
7458
75* *Amazon Linux AMI* (works the same as *CentOS* 5)59* *Amazon Linux AMI* (works the same as *CentOS* 5)
7660
77Percona `yum` Experimental repository61Percona `yum` Testing repository
78=====================================62================================
7963
80Percona offers fresh beta builds from the experimental repository. To subscribe to the experimental repository, install the experimental *RPM*: ::64Percona 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.
81
82 yum install 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
8665
87.. rubric:: Footnotes66.. rubric:: Footnotes
8867

Subscribers

People subscribed via source and target branches