Merge lp:~tplavcic/percona-server/bug1174779-5.5 into lp:percona-server/5.5
Proposed by
Tomislav Plavcic
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 648 |
Proposed branch: | lp:~tplavcic/percona-server/bug1174779-5.5 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
93 lines (+20/-7) (has conflicts) 4 files modified
Makefile-ps (+2/-2) UDF/configure.ac (+1/-1) build-ps/build-binary.sh (+14/-1) build-ps/percona-server.spec (+3/-3) Text conflict in build-ps/build-binary.sh |
To merge this branch: | bzr merge lp:~tplavcic/percona-server/bug1174779-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+213229@code.launchpad.net |
This proposal supersedes a proposal from 2014-03-12.
Description of the change
Replaced MaatKit with Percona Toolkit
Fixed build flags
Discussed this with Laurynas over mail and it seems like I've forgot to resubmit MP.
Param build for 5.5 was:
https:/
To post a comment you must log in.
Made another proposal, just not sure I did it right so please check my workflow.