Merge lp:~hrvojem/percona-server/bug1186755-5.5-trunk into lp:percona-server/5.5
Proposed by
Hrvoje Matijakovic
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Laurynas Biveinis | ||||||||||||||||||||||||||||
Approved revision: | no longer in the source branch. | ||||||||||||||||||||||||||||
Merged at revision: | 538 | ||||||||||||||||||||||||||||
Proposed branch: | lp:~hrvojem/percona-server/bug1186755-5.5-trunk | ||||||||||||||||||||||||||||
Merge into: | lp:percona-server/5.5 | ||||||||||||||||||||||||||||
Diff against target: |
91 lines (+43/-1) 2 files modified
doc/source/release-notes/Percona-Server-5.5.15-21.0.rst (+1/-1) doc/source/upstream-bug-fixes.rst (+42/-0) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~hrvojem/percona-server/bug1186755-5.5-trunk | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+169375@code.launchpad.net |
To post a comment you must log in.
This MP added doc/source/ ext/psdom. pyc, which probably was not intended (we don't have other .pyc files in the doc/ or anywhere else in the source tree), bug 1194486.