Merge lp://qastaging/~dshrews/drizzle/bug720908_jdaly_branch into lp://qastaging/drizzle/7.0
Proposed by
David Shrewsbury
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2163 |
| Merged at revision: | 2209 |
| Proposed branch: | lp://qastaging/~dshrews/drizzle/bug720908_jdaly_branch |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
58 lines (+9/-6) 2 files modified
plugin/slave/queue_producer.cc (+8/-5) plugin/slave/queue_producer.h (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~dshrews/drizzle/bug720908_jdaly_branch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
This is Joe's bug fix branch, just updated to merge it with trunk and push it through for him.
This branch adds reconnect attempts if the slave is started before the master.
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
