Created by James Hunt on 2014-05-02 and last modified on 2014-06-04
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1315060
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

1623. By James Hunt on 2014-06-04

* Sync with lp:upstart.

1622. By James Hunt on 2014-05-21

* init/main.c: Add support for '--prepend-confdir'.
* init/man/init.8: Add '--prepend-confdir'.
* init/tests/test_main.c: Add tests for '--prepend-confdir'.

1621. By James Hunt on 2014-05-09

* init/main.c: add '--append-confdir' command-line option (LP: #1315060).
* init/man/init.8:
  - Document '--append-confdir'.
  - Add init(5) reference for '--confdir'.
* init/tests/test_main.c: New Session and System init tests for

1620. By James Hunt on 2014-05-08

* Sync with lp:upstart.

1619. By James Hunt on 2014-05-02

* init/main.c: main(): Allow System Init read from multiple
  configuration to directories like a Session Init (LP: #1315060).
* init/man/init.5: Clarify default directory.
* init/man/init.8: Explain new behaviour.
* init/tests/test_main.c: test_confdir(): Update tests for new
  '--confdir' behaviour of System init.

1618. By James Hunt on 2014-04-24

* init/man/init.5: Further clarification of 'respawn limit'.

1617. By James Hunt on 2014-04-24

* init/man.5:
  - Clarify default behaviour of 'respawn' stanza.
  - Add missing 'respawn limit unlimited' details.

1616. By James Hunt on 2014-04-17

* Merge of lp:~xnox/upstart/empty-session.

1615. By Adam Conrad on 2014-04-11

Disable chroot sessions by default, add an option to enable chroot sessions.

1614. By Dimitri John Ledkov on 2014-04-11

Clean up child process, on memory allocation failures in test_status_action/reload failed.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.