Merge lp://qastaging/~simonklb/charm-helpers/JUJU_CHARM_DIR into lp://qastaging/charm-helpers

Proposed by Simon Kollberg
Status: Needs review
Proposed branch: lp://qastaging/~simonklb/charm-helpers/JUJU_CHARM_DIR
Merge into: lp://qastaging/charm-helpers
Diff against target: 81 lines (+12/-4)
4 files modified
charmhelpers/core/hookenv.py (+1/-1)
tests/contrib/hardening/host/checks/test_profile.py (+3/-0)
tests/contrib/hardening/test_templating.py (+2/-2)
tests/core/test_hookenv.py (+6/-1)
To merge this branch: bzr merge lp://qastaging/~simonklb/charm-helpers/JUJU_CHARM_DIR
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+322578@code.qastaging.launchpad.net
To post a comment you must log in.

Unmerged revisions

726. By Simon Kollberg

Use JUJU_CHARM_DIR instead of CHARM_DIR in hookenv

725. By Simon Kollberg

Patch JUJU_CHARM_DIR instead of setting it globally in contrib.hardering tests

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