Merge lp://qastaging/~olafvdspek/drizzle/refactor13 into lp://qastaging/drizzle

Proposed by Olaf van der Spek
Status: Superseded
Proposed branch: lp://qastaging/~olafvdspek/drizzle/refactor13
Merge into: lp://qastaging/drizzle
Diff against target: 136 lines (+13/-24)
4 files modified
drizzled/atomic/gcc_traits.h (+1/-3)
drizzled/atomic/pthread_traits.h (+0/-4)
drizzled/atomics.h (+4/-9)
drizzled/drizzled.cc (+8/-8)
To merge this branch: bzr merge lp://qastaging/~olafvdspek/drizzle/refactor13
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+108496@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-08-01.

Description of the change

Take 2

To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Is your editor adjusting white space noise?

Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

It's trimming trailing whitespace.

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