[Branch ~upstart-devel/upstart/trunk] Rev 1595: Merge lp:~jamesodhunt/upstart/fix-python-tests

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/fix-python-tests/+merge/195210
  proposed by: James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1595 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Wed 2014-03-05 10:34:32 +0000
message:
  Merge lp:~jamesodhunt/upstart/fix-python-tests
renamed:
  scripts/pyupstart.py => scripts/pyupstart.py.in
modified:
  scripts/Makefile.am
  scripts/tests/test_pyupstart_session_init.py
  scripts/tests/test_pyupstart_system_init.py
  scripts/pyupstart.py.in


--
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: 6522 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140305/b3bc4379/attachment.diff>