Charm Helpers

Merge lp:~1chb1n/charm-helpers/amulet-lint-missed into lp:charm-helpers

  1. amulet-lint-missed
  2. Merge into devel
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 390
Proposed branch: lp:~1chb1n/charm-helpers/amulet-lint-missed
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/amulet/utils.py (+1/-1)
To merge this branch: bzr merge lp:~1chb1n/charm-helpers/amulet-lint-missed
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+261859@code.launchpad.net

Description of the change

Lint snuck in due to charm-helpers bug 1464685. This fixes the affected line, but does not address that underlying bug.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/amulet/utils.py'
2--- charmhelpers/contrib/amulet/utils.py 2015-06-11 19:46:51 +0000
3+++ charmhelpers/contrib/amulet/utils.py 2015-06-12 14:50:39 +0000
4@@ -99,7 +99,7 @@
5 used to verify system services are running on the corresponding
6 service units.
7
8- :param commands: dict with sentry keys and arbitrary command list values
9+ :param commands: dict with sentry keys and arbitrary command list vals
10 :returns: None if successful, Failure string message otherwise
11 """
12 self.log.debug('Checking status of system services...')

Subscribers

People subscribed via source and target branches