Merge lp://qastaging/~vjsamuel/drizzle/fix-bug-715789 into lp://qastaging/drizzle/7.0

Proposed by Vijay Samuel
Status: Superseded
Proposed branch: lp://qastaging/~vjsamuel/drizzle/fix-bug-715789
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 68 lines (+29/-29)
1 file modified
tests/include.am (+29/-29)
To merge this branch: bzr merge lp://qastaging/~vjsamuel/drizzle/fix-bug-715789
Reviewer Review Type Date Requested Status
Lee Bieber (community) Needs Fixing
Review via email: mp+49154@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-02-09.

This proposal has been superseded by a proposal from 2011-02-10.

To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote : Posted in a previous version of this proposal

please re-merge it has conflicts when merging with your other branch

Text conflict in tests/include.am

review: Needs Fixing
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Builds are broken, unit tests are being run over and over....

see http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-opensuse-64bit/1291/console as an example

review: Needs Fixing
2154. By Vijay Samuel

Merge fix for build issue

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches