Merge lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/lint into lp://qastaging/charms/trusty/rsyslog-forwarder-ha

Proposed by Cory Johns
Status: Merged
Merged at revision: 11
Proposed branch: lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/lint
Merge into: lp://qastaging/charms/trusty/rsyslog-forwarder-ha
Diff against target: 54 lines (+19/-4)
4 files modified
.bzrignore (+2/-0)
Makefile (+4/-4)
test_requirements.txt (+1/-0)
tox.ini (+12/-0)
To merge this branch: bzr merge lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/lint
Reviewer Review Type Date Requested Status
Kevin W Monroe (community) Approve
Review via email: mp+288469@code.qastaging.launchpad.net

Description of the change

To post a comment you must log in.
12. By Cory Johns

Fix `make test` breaking subsequent charm-proof during bundle test

Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

LGTM, merged

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches