Light Display Manager

Merge lp://qastaging/~robert-ancell/lightdm/conf.d into lp://qastaging/lightdm

  1. conf.d
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1692
Merged at revision: 1688
Proposed branch: lp://qastaging/~robert-ancell/lightdm/conf.d
Merge into: lp://qastaging/lightdm
Diff against target: 309 lines (+157/-8)
9 files modified
src/configuration.c (+26/-1)
src/lightdm.c (+60/-6)
tests/Makefile.am (+4/-0)
tests/scripts/0-additional.conf (+2/-0)
tests/scripts/1-additional.conf (+2/-0)
tests/scripts/additional-config.conf (+29/-0)
tests/src/libsystem.c (+17/-0)
tests/src/test-runner.c (+15/-1)
tests/test-additional-config (+2/-0)
To merge this branch: bzr merge lp://qastaging/~robert-ancell/lightdm/conf.d
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+169973@code.qastaging.launchpad.net

Commit message

Load configuration from /etc/lightdm/lightdm.conf.d

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1688
http://jenkins.qa.ubuntu.com/job/lightdm-ci/78/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/72/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/78/rebuild

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

FAILED: Continuous integration, rev:1688
http://jenkins.qa.ubuntu.com/job/lightdm-ci/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/79/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~robert-ancell/lightdm/conf.d updated
1689. By Robert Ancell

Fix tests running on server

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

FAILED: Continuous integration, rev:1689
http://jenkins.qa.ubuntu.com/job/lightdm-ci/80/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/74/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/80/rebuild

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

FAILED: Continuous integration, rev:1689
http://jenkins.qa.ubuntu.com/job/lightdm-ci/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/75/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/81/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~robert-ancell/lightdm/conf.d updated
1690. By Robert Ancell

Enable debugging to work out what is going on on the server

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

FAILED: Continuous integration, rev:1690
http://jenkins.qa.ubuntu.com/job/lightdm-ci/82/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/76/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/82/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~robert-ancell/lightdm/conf.d updated
1691. By Robert Ancell

Fix session name for additional config test

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

FAILED: Continuous integration, rev:1691
http://jenkins.qa.ubuntu.com/job/lightdm-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/77/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/83/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~robert-ancell/lightdm/conf.d updated
1692. By Robert Ancell

Really fix Fix session name for additional config test

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

PASSED: Continuous integration, rev:1692
http://jenkins.qa.ubuntu.com/job/lightdm-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/78

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/84/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

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