Merge lp:~laurynas-biveinis/percona-server/merge-5.5-to-5.6.12 into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 390
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.5-to-5.6.12
Merge into: lp:percona-server/5.6
Diff against target: 8 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.5-to-5.6.12
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+171300@code.launchpad.net

Description of the change

Merge lp:percona-server/5.5 revisions 517--541 to
lp:percona-server/5.6.

A null-merge with the exception that the removal of
  doc/source/percona-theme/static/boxes_header_bulletpoint.png.moved
  doc/source/percona-theme/static/button-download-icon.png.moved
  doc/source/percona-theme/static/content_list_bulletpoint.png.moved
  doc/source/percona-theme/static/side_buttons.png.moved
has been merged, fixing bug 1130731 for 5.6.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'doc/source/percona-theme/static/boxes_header_bulletpoint.png.moved'
2Binary files doc/source/percona-theme/static/boxes_header_bulletpoint.png.moved 2012-07-12 08:48:23 +0000 and doc/source/percona-theme/static/boxes_header_bulletpoint.png.moved 1970-01-01 00:00:00 +0000 differ
3=== removed file 'doc/source/percona-theme/static/button-download-icon.png.moved'
4Binary files doc/source/percona-theme/static/button-download-icon.png.moved 2012-07-12 08:48:23 +0000 and doc/source/percona-theme/static/button-download-icon.png.moved 1970-01-01 00:00:00 +0000 differ
5=== removed file 'doc/source/percona-theme/static/content_list_bulletpoint.png.moved'
6Binary files doc/source/percona-theme/static/content_list_bulletpoint.png.moved 2012-07-12 08:48:23 +0000 and doc/source/percona-theme/static/content_list_bulletpoint.png.moved 1970-01-01 00:00:00 +0000 differ
7=== removed file 'doc/source/percona-theme/static/side_buttons.png.moved'
8Binary files doc/source/percona-theme/static/side_buttons.png.moved 2012-07-12 08:48:23 +0000 and doc/source/percona-theme/static/side_buttons.png.moved 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches