Mir

Merge lp://qastaging/~alan-griffiths/mir/more-flexible-DefaultConfiguration-for-0.1.6 into lp://qastaging/~mir-team/mir/trunk-0.1.6

Proposed by Alan Griffiths
Status: Merged
Merge reported by: Daniel van Vugt
Merged at revision: not available
Proposed branch: lp://qastaging/~alan-griffiths/mir/more-flexible-DefaultConfiguration-for-0.1.6
Merge into: lp://qastaging/~mir-team/mir/trunk-0.1.6
Diff against target: 168 lines (+69/-55)
3 files modified
debian/changelog (+2/-0)
include/platform/mir/options/default_configuration.h (+13/-1)
src/platform/options/default_configuration.cpp (+54/-54)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/more-flexible-DefaultConfiguration-for-0.1.6
Reviewer Review Type Date Requested Status
Daniel van Vugt Disapprove
Kevin DuBois (community) Approve
Alberto Aguirre (community) Approve
Review via email: mp+209035@code.qastaging.launchpad.net

Commit message

options: Make it easier to customize DefaultConfiguration

Description of the change

options: Make it easier to customize DefaultConfiguration

To post a comment you must log in.
Revision history for this message
Alberto Aguirre (albaguirre) :
review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

What's the motivation for trying to squeeze this into distro so quickly?

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> What's the motivation for trying to squeeze this into distro so quickly?

To support a USC usecase - https://code.launchpad.net/~alan-griffiths/unity-system-compositor/mir-0.1.6/+merge/209037

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

OK. With or without a bug number something should be mentioned in debian/changelog then.

review: Needs Fixing
1439. By Alan Griffiths

merge lp:~mir-team/mir/trunk-0.1.6

1440. By Alan Griffiths

Cherry picking in changelog

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> OK. With or without a bug number something should be mentioned in
> debian/changelog then.

Like this?

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Rejected. Kgunn seems to have merged it (differently) by hand.

review: Disapprove

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