Merge lp:~chris.gagnon/autopilot/lp1183618 into lp:autopilot
Proposed by
Chris Gagnon
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Thomi Richards | ||||
Approved revision: | 223 | ||||
Merged at revision: | 222 | ||||
Proposed branch: | lp:~chris.gagnon/autopilot/lp1183618 | ||||
Merge into: | lp:autopilot | ||||
Diff against target: |
93 lines (+19/-13) 4 files modified
autopilot/__init__.py (+1/-3) autopilot/tests/functional/test_autopilot_functional.py (+13/-6) autopilot/tests/unit/test_command_line_args.py (+0/-4) bin/autopilot (+5/-0) |
||||
To merge this branch: | bzr merge lp:~chris.gagnon/autopilot/lp1183618 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomi Richards (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+165529@code.launchpad.net |
Commit message
don't require -r if -rd is used fixes lp:1183618
Description of the change
don't require -r if -rd is used
To post a comment you must log in.
FAILED: Continuous integration, rev:220 jenkins. qa.ubuntu. com/job/ autopilot- ci/102/ jenkins. qa.ubuntu. com/job/ autopilot- saucy-amd64- ci/30/console jenkins. qa.ubuntu. com/job/ autopilot- saucy-armhf- ci/30/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ autopilot- ci/102/ rebuild
http://