Mir

Merge lp:~alan-griffiths/mir/fix-1244192 into lp:mir/0.1

  1. fix-1244192
  2. Merge into trusty
Proposed by Alan Griffiths
Status: Merged
Merged at revision: 1161
Proposed branch: lp:~alan-griffiths/mir/fix-1244192
Merge into: lp:mir/0.1
Diff against target: 11 lines (+1/-0)
1 file modified
include/server/mir/default_server_configuration.h (+1/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1244192
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Daniel van Vugt Approve
Alexandros Frantzis (community) Approve
Review via email: mp+192503@code.launchpad.net

Commit message

config: ensure USC can access DefaultConfigurationOptions::parse_options
(LP: #1244192)

Description of the change

config: ensure USC can access DefaultConfigurationOptions::parse_options

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1161
http://jenkins.qa.ubuntu.com/job/mir-ci/1603/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1603/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1161
http://jenkins.qa.ubuntu.com/job/mir-ci/1604/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1604/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/714/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2945
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/1/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/715/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2950
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/2/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/716/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2951
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/3
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/3/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/717/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2955
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/4
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/4
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/4/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/718/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2957
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/5/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/server/mir/default_server_configuration.h'
2--- include/server/mir/default_server_configuration.h 2013-10-22 13:16:25 +0000
3+++ include/server/mir/default_server_configuration.h 2013-10-24 13:12:59 +0000
4@@ -242,6 +242,7 @@
5 protected:
6 using DefaultConfigurationOptions::the_options;
7 using DefaultConfigurationOptions::add_options;
8+ using DefaultConfigurationOptions::parse_options;
9
10 virtual std::shared_ptr<input::InputChannelFactory> the_input_channel_factory();
11 virtual std::shared_ptr<shell::MediatingDisplayChanger> the_mediating_display_changer();

Subscribers

People subscribed via source and target branches