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

Proposed by Dimitri John Ledkov
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 Pending
Review via email: mp+189153@code.launchpad.net
To post a comment you must log in.
lp:~xnox/upstart/fix-1234841 updated
1540. By James Hunt

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

1541. By Dimitri John Ledkov

merge lp:~jamesodhunt/upstart/bug-1234898

1542. By Steve Langasek

Merge lp:~vorlon/upstart/lp.1235480

1544. By James Hunt

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

1545. By Steve Langasek

syntax fix

1546. By Steve Langasek

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

1547. By James Hunt

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

1548. By Dimitri John Ledkov

Add options to disable local & socket bridges.

1549. By Dimitri John Ledkov

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

1550. By Dimitri John Ledkov

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

1551. By Dimitri John Ledkov

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

1552. By Dimitri John Ledkov

merge lp:~jamesodhunt/upstart/bug-1240686

1553. By Dimitri John Ledkov

merge lp:~vorlon/upstart/lp.1244763

1554. By James Hunt

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

1555. By Dimitri John Ledkov

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

1556. By Dimitri John Ledkov

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

Similarly provide XDG_RUNTIME_DIR for testing session D-Bus connections.

1558. By Dimitri John Ledkov

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

1559. By James Hunt

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

1560. By James Hunt

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

1561. By Steve Langasek

Merge lp:~jamesodhunt/upstart/bug-1238078

1562. By Dimitri John Ledkov

No need to use GNU extension

1563. By Dimitri John Ledkov

Fix test to use updated start_upstart_common API

1564. By Dimitri John Ledkov

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

1565. By Dimitri John Ledkov

Unset environment variables, to have reproducible test results.

1566. By Dimitri John Ledkov

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

Unmerged revisions

1566. By Dimitri John Ledkov

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
=== modified file 'extra/conf-session/upstart-file-bridge.conf'
--- extra/conf-session/upstart-file-bridge.conf 2013-07-18 14:12:13 +0000
+++ extra/conf-session/upstart-file-bridge.conf 2013-10-03 18:03:18 +0000
@@ -7,7 +7,7 @@
77
8emits file8emits file
99
10start on startup10start on startup and started dbus
11stop on session-end11stop on session-end
1212
13expect daemon13expect daemon

Subscribers

People subscribed via source and target branches