Merge lp:~percona-core/percona-server/release-5.6.13-60.6 into lp:percona-server/5.6

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 426
Merged at revision: 442
Proposed branch: lp:~percona-core/percona-server/release-5.6.13-60.6
Merge into: lp:percona-server/5.6
Diff against target: 35 lines (+3/-3)
3 files modified
Makefile (+1/-1)
build/debian/rules (+1/-1)
build/percona-server.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.13-60.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+188471@code.launchpad.net

Description of the change

Changes for release 5.6.13-60.6.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-08-28 14:46:37 +0000
3+++ Makefile 2013-09-30 21:50:41 +0000
4@@ -1,5 +1,5 @@
5 MYSQL_VERSION=5.6.13
6-PERCONA_SERVER_VERSION=rc60.5
7+PERCONA_SERVER_VERSION=rc60.6
8 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
9 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
10 PERCONA_SERVER_SHORT_2 ?=Percona-Server
11
12=== modified file 'build/debian/rules'
13--- build/debian/rules 2013-09-28 16:15:05 +0000
14+++ build/debian/rules 2013-09-30 21:50:41 +0000
15@@ -9,7 +9,7 @@
16
17 feature_set="community"
18 major_version=60
19-minor_version=5
20+minor_version=6
21 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
22 server_suffix="-rc$(major_version).$(minor_version)"
23 prefix="/usr"
24
25=== modified file 'build/percona-server.spec'
26--- build/percona-server.spec 2013-09-27 20:43:18 +0000
27+++ build/percona-server.spec 2013-09-30 21:50:41 +0000
28@@ -28,7 +28,7 @@
29 %define mysql_version 5.6.13
30 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
31 %define majorversion 60
32-%define minorversion 5
33+%define minorversion 6
34 %define distribution rhel%{redhatversion}
35 %define percona_server_version rc%{majorversion}.%{minorversion}
36

Subscribers

People subscribed via source and target branches

to all changes: