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: no longer in the source branch.
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
=== modified file 'Makefile'
--- Makefile 2013-08-28 14:46:37 +0000
+++ Makefile 2013-09-30 21:50:41 +0000
@@ -1,5 +1,5 @@
1MYSQL_VERSION=5.6.131MYSQL_VERSION=5.6.13
2PERCONA_SERVER_VERSION=rc60.52PERCONA_SERVER_VERSION=rc60.6
3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
5PERCONA_SERVER_SHORT_2 ?=Percona-Server5PERCONA_SERVER_SHORT_2 ?=Percona-Server
66
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-09-28 16:15:05 +0000
+++ build/debian/rules 2013-09-30 21:50:41 +0000
@@ -9,7 +9,7 @@
99
10feature_set="community"10feature_set="community"
11major_version=6011major_version=60
12minor_version=512minor_version=6
13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
14server_suffix="-rc$(major_version).$(minor_version)"14server_suffix="-rc$(major_version).$(minor_version)"
15prefix="/usr"15prefix="/usr"
1616
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-09-27 20:43:18 +0000
+++ build/percona-server.spec 2013-09-30 21:50:41 +0000
@@ -28,7 +28,7 @@
28%define mysql_version 5.6.1328%define mysql_version 5.6.13
29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
30%define majorversion 6030%define majorversion 60
31%define minorversion 531%define minorversion 6
32%define distribution rhel%{redhatversion}32%define distribution rhel%{redhatversion}
33%define percona_server_version rc%{majorversion}.%{minorversion}33%define percona_server_version rc%{majorversion}.%{minorversion}
3434

Subscribers

People subscribed via source and target branches

to all changes: