Merge lp:~allenap/launchpad/dynamic-batch-size-bug-546085-db-devel-preempt-conflict into lp:launchpad/db-devel
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~allenap/launchpad/dynamic-batch-size-bug-546085-db-devel-preempt-conflict |
Merge into: | lp:launchpad/db-devel |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp:~allenap/launchpad/dynamic-batch-size-bug-546085-db-devel-preempt-conflict |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Abel Deuring (community) | code | Approve | |
Review via email: mp+23114@code.launchpad.net |
Commit message
Preemptively merge lp:~allenap/launchpad/dynamic-batch-size-bug-546085-devel to avoid future conflict.
Description of the change
This is db-devel with lp:~allenap/launchpad/dynamic-batch-size-bug-546085-devel merged in. There is no textual diff, but it will nevertheless prevent conflicts when devel gets automatically merged into db-devel.
To post a comment you must log in.