Merge lp://qastaging/~hrvojem/percona-xtradb-cluster/bug918568 into lp://qastaging/~percona-dev/percona-xtradb-cluster/5.5.17-22.1
Proposed by
Hrvoje Matijakovic
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Vadim Tkachenko | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 3695 | ||||
| Proposed branch: | lp://qastaging/~hrvojem/percona-xtradb-cluster/bug918568 | ||||
| Merge into: | lp://qastaging/~percona-dev/percona-xtradb-cluster/5.5.17-22.1 | ||||
| Diff against target: |
56 lines (+12/-5) 2 files modified
doc/source/faq.rst (+8/-1) doc/source/glossary.rst (+4/-4) |
||||
| To merge this branch: | bzr merge lp://qastaging/~hrvojem/percona-xtradb-cluster/bug918568 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vadim Tkachenko | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I see merge conflict there
+<<<<<<< TREE