Juju Charms Collection
haproxy package

Merge lp://staging/~james-w/charms/precise/haproxy/metrics into lp://staging/charms/haproxy

  1. Precise Pangolin (12.04)
  2. metrics
  3. Merge into trunk
Proposed by James Westby
Status: Merged
Merged at revision: 80
Proposed branch: lp://staging/~james-w/charms/precise/haproxy/metrics
Merge into: lp://staging/charms/haproxy
Diff against target: 112 lines (+84/-1)
3 files modified
hooks/hooks.py (+6/-1)
hooks/tests/test_install.py (+56/-0)
hooks/tests/test_upgrade_charm.py (+22/-0)
To merge this branch: bzr merge lp://staging/~james-w/charms/precise/haproxy/metrics
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+221408@code.staging.launchpad.net

Description of the change

Hi,

When adding the metrics support I missed installing the python-jinja2
package on upgrades.

This fixes that by calling the install hook on upgrades.

It also adds some unit tests for upgrade/install.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

Looks good to me James, thanks for the contribution + tests

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