Merge lp:~percona-core/percona-server/release-5.1.69-14.7 into lp:percona-server/5.1

Proposed by Ignacio Nin on 2013-06-10
Status: Merged
Approved by: Laurynas Biveinis on 2013-06-11
Approved revision: 572
Merged at revision: 573
Proposed branch: lp:~percona-core/percona-server/release-5.1.69-14.7
Merge into: lp:percona-server/5.1
Diff against target: 41 lines (+4/-4)
3 files modified
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
build/percona-shared-compat.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.1.69-14.7
Reviewer Review Type Date Requested Status
Laurynas Biveinis 2013-06-10 Approve on 2013-06-11
Review via email: mp+168516@code.launchpad.net

Description of the change

Changes for release 5.1.69-14.7

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/debian/rules'
2--- build/debian/rules 2013-06-05 21:03:30 +0000
3+++ build/debian/rules 2013-06-10 18:36:26 +0000
4@@ -9,7 +9,7 @@
5 TMP=$(CURDIR)/debian/tmp/
6
7 major_version_default=14
8-minor_version_default=6
9+minor_version_default=7
10
11 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
12 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
13
14=== modified file 'build/percona-server.spec'
15--- build/percona-server.spec 2013-06-06 03:39:30 +0000
16+++ build/percona-server.spec 2013-06-10 18:36:26 +0000
17@@ -14,9 +14,9 @@
18 %define mysql_vendor Percona, Inc
19 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
20 %define community 1
21-%define mysqlversion 5.1.68
22+%define mysqlversion 5.1.69
23 %define majorversion 14
24-%define minorversion 6
25+%define minorversion 7
26 %define distribution rhel%{redhatversion}
27 %define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
28
29
30=== modified file 'build/percona-shared-compat.spec'
31--- build/percona-shared-compat.spec 2013-05-23 09:09:56 +0000
32+++ build/percona-shared-compat.spec 2013-06-10 18:36:26 +0000
33@@ -28,7 +28,7 @@
34 #
35 # Change this to match the version of the shared libs you want to include
36 #
37-%define version51 5.1.68
38+%define version51 5.1.69
39 %define version50 5.0.91
40 %define version41 4.1.22
41 %define version40 4.0.27

Subscribers

People subscribed via source and target branches