Merge lp://staging/~thomir-deactivatedaccount/autopilot/fix-1180124 into lp://staging/autopilot
Proposed by
Thomi Richards
| Status: | Merged |
|---|---|
| Approved by: | Martin Mrazik |
| Approved revision: | 207 |
| Merged at revision: | 207 |
| Proposed branch: | lp://staging/~thomir-deactivatedaccount/autopilot/fix-1180124 |
| Merge into: | lp://staging/autopilot |
| Diff against target: |
42 lines (+5/-8) 2 files modified
autopilot/tests/functional/test_autopilot_functional.py (+0/-4) bin/autopilot (+5/-4) |
| To merge this branch: | bzr merge lp://staging/~thomir-deactivatedaccount/autopilot/fix-1180124 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Martin Mrazik (community) | Approve | ||
|
Review via email:
|
|||
Commit message
fix bug lp:1180124 - don't patch PYTHONPATH when we're running from /usr/ somewhere, and don't explicitly patch it in the functional test suite.
Description of the change
fix bug lp:1180124 - don't patch PYTHONPATH when we're running from /usr/ somewhere, and don't explicitly patch it in the functional test suite.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Martin Mrazik (mrazik) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:207
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://