[Branch ~upstart-devel/upstart/trunk] Rev 1425: * Sync with lp:upstart and resolve test issues relating to new session

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/initctl-list-sessions/+merge/145325
  proposed by: Steve Langasek (vorlon)
  review: Needs Fixing - Steve Langasek (vorlon)
  https://code.launchpad.net/~jamesodhunt/upstart/add-session-file/+merge/144881
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Steve Langasek (vorlon)
  review: Approve - Dmitrijs Ledkovs (xnox)
  https://code.launchpad.net/~jamesodhunt/upstart/remove-basic-user-sessions/+merge/144873
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Colin Watson (cjwatson)
  review: Needs Fixing - Steve Langasek (vorlon)
------------------------------------------------------------
revno: 1425 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart-setenv+getenv
timestamp: Thu 2013-01-31 16:51:49 +0000
message:
  * Sync with lp:upstart and resolve test issues relating to new session
    code. In so doing, the revised test suite found 3 bugs which are now
    fixed:
  
    - control_get_session(): We now actually pass @session as a parameter.
    - job_class_find(): Initialise class to avoid undefined behaviour.
      undefined behaviour.
    - get_env_action(): Wasn't passing job+instance details to init.
removed:
  TESTING.sessions
modified:
  ChangeLog
  init/control.c
  init/control.h
  init/job_class.c
  init/main.c
  init/man/init.5
  init/paths.h
  init/tests/test_xdg.c
  init/xdg.c
  init/xdg.h
  util/Makefile.am
  util/initctl.c
  util/man/initctl.8
  util/tests/test_initctl.c


--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk

Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
-------------- next part --------------
A non-text attachment was scrubbed...
Name: revision-diff.txt
Type: text/x-diff
Size: 59795 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130131/2630674f/attachment-0001.diff>