Merge lp:~johnsca/charm-helpers/cmdline-conditional-import into lp:charm-helpers
Proposed by
Cory Johns
Status: | Merged |
---|---|
Merged at revision: | 418 |
Proposed branch: | lp:~johnsca/charm-helpers/cmdline-conditional-import |
Merge into: | lp:charm-helpers |
Diff against target: |
27 lines (+16/-1) 1 file modified
charmhelpers/core/hookenv.py (+16/-1) |
To merge this branch: | bzr merge lp:~johnsca/charm-helpers/cmdline-conditional-import |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler (community) | Approve | ||
Review via email:
|
Description of the change
Conditional import of cmdline in hookenv so that we can still avoid duplication while gracefully dealing with charms that partially sync charmhelpers directly in (sans the cli portion).
To post a comment you must log in.
+1 LGTM - expressing this into upstream as it broke OpenStack CI - if this causes an issue lets bug it and circle back.
move along, this is not the droid you are looking for.