Merge lp:~xnox/upstart/fix-1234841 into lp:upstart

Proposed by Dimitri John Ledkov on 2013-10-03
Status: Superseded
Proposed branch: lp:~xnox/upstart/fix-1234841
Merge into: lp:upstart
Diff against target: 12 lines (+1/-1)
1 file modified
extra/conf-session/upstart-file-bridge.conf (+1/-1)
To merge this branch: bzr merge lp:~xnox/upstart/fix-1234841
Reviewer Review Type Date Requested Status
Upstart Reviewers 2013-10-03 Pending
Review via email: mp+189153@code.launchpad.net
To post a comment you must log in.
lp:~xnox/upstart/fix-1234841 updated on 2013-11-08
1540. By James Hunt on 2013-10-04

* Merge of lp:~xnox/upstart/fix-1234841.

1541. By Dimitri John Ledkov on 2013-10-04

merge lp:~jamesodhunt/upstart/bug-1234898

1542. By Steve Langasek on 2013-10-04

Merge lp:~vorlon/upstart/lp.1235480

1544. By James Hunt on 2013-10-23

* util/initctl.h: IS_INIT_EVENT(): Ignore session end event when
  running in user mode (for 'check-config').

1545. By Steve Langasek on 2013-10-23

syntax fix

1546. By Steve Langasek on 2013-10-23

Merge lp:~xnox/upstart/fix-socket-bridge-path

1547. By James Hunt on 2013-10-28

* Merge of lp:~vorlon/upstart/lp.1235387.

1548. By Dimitri John Ledkov on 2013-10-31

Add options to disable local & socket bridges.

1549. By Dimitri John Ledkov on 2013-11-03

merge lp:~jamesodhunt/upstart/bug-1221466+1222702

1550. By Dimitri John Ledkov on 2013-11-03

merge lp:~jamesodhunt/upstart/fix-system-reexec-test

1551. By Dimitri John Ledkov on 2013-11-03

merge lp:~jamesodhunt/upstart/environ-remove-tests

1552. By Dimitri John Ledkov on 2013-11-03

merge lp:~jamesodhunt/upstart/bug-1240686

1553. By Dimitri John Ledkov on 2013-11-03

merge lp:~vorlon/upstart/lp.1244763

1554. By James Hunt on 2013-11-04

* Merge lp:~jamesodhunt/upstart/bug-1235649.

1555. By Dimitri John Ledkov on 2013-11-05

merge lp:~jamesodhunt/upstart/disable-system-bus with conflicts resolved

1556. By Dimitri John Ledkov on 2013-11-06

Actually run test_umask against a fresh session init, in it's own XDG_RUNTIME_DIR.
Since session init needs to create sub-folders, use 0077 umask under test.

1557. By Dimitri John Ledkov on 2013-11-06

Similarly provide XDG_RUNTIME_DIR for testing session D-Bus connections.

1558. By Dimitri John Ledkov on 2013-11-06

Skip quiesce tests, when precise timing information is not available.

1559. By James Hunt on 2013-11-06

* Merged lp:~xnox/upstart/abi-check.

1560. By James Hunt on 2013-11-06

* Merge of lp:~vorlon/upstart/check-for-overlayfs with minor tweaks.

1561. By Steve Langasek on 2013-11-07

Merge lp:~jamesodhunt/upstart/bug-1238078

1562. By Dimitri John Ledkov on 2013-11-07

No need to use GNU extension

1563. By Dimitri John Ledkov on 2013-11-07

Fix test to use updated start_upstart_common API

1564. By Dimitri John Ledkov on 2013-11-07

Hacked FORCE target fails with automake1.14, let's switch to non-recursive make.

1565. By Dimitri John Ledkov on 2013-11-08

Unset environment variables, to have reproducible test results.

1566. By Dimitri John Ledkov on 2013-11-08

Introduce TAP output, when available. Mark failing tests as TODO. Need
to be fixed.

Unmerged revisions

1566. By Dimitri John Ledkov on 2013-11-08

Introduce TAP output, when available. Mark failing tests as TODO. Need
to be fixed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extra/conf-session/upstart-file-bridge.conf'
2--- extra/conf-session/upstart-file-bridge.conf 2013-07-18 14:12:13 +0000
3+++ extra/conf-session/upstart-file-bridge.conf 2013-10-03 18:03:18 +0000
4@@ -7,7 +7,7 @@
5
6 emits file
7
8-start on startup
9+start on startup and started dbus
10 stop on session-end
11
12 expect daemon

Subscribers

People subscribed via source and target branches