Juju Charms Collection
squid-reverseproxy package

Merge lp://qastaging/~brad-marshall/charms/precise/squid-reverseproxy/fixed-ports-path into lp://qastaging/charms/squid-reverseproxy

  1. Precise Pangolin (12.04)
  2. fixed-ports-path
  3. Merge into trunk
Proposed by Brad Marshall
Status: Work in progress
Proposed branch: lp://qastaging/~brad-marshall/charms/precise/squid-reverseproxy/fixed-ports-path
Merge into: lp://qastaging/charms/squid-reverseproxy
Diff against target: 19 lines (+2/-2)
1 file modified
hooks/hooks.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/precise/squid-reverseproxy/fixed-ports-path
Reviewer Review Type Date Requested Status
Matt Bruzek (community) Needs Fixing
Dave Cheney (community) Approve
Review via email: mp+184023@code.qastaging.launchpad.net

Description of the change

Removed the path to open-port and close port since its no longer in that location, this breaks the charm with juju-core.

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM. Yes, please don't assume hard coded paths for the tools.

review: Approve
Reply
Revision history for this message
Matt Bruzek (mbruzek) wrote :

Hi Brad,

This merge proposal did not merge cleanly. If you wish for this fix to be added, please fix the merge and resubmit.

1 conflicts encountered.

I am going to put this merge proposal in incomplete status. Please put the status in needs review when you fix it.

Thanks!

review: Needs Fixing
Reply

Unmerged revisions

42. By Brad Marshall

[bradm] Removed /usr/bin from open-port and close-port as it doesn't work with non juju 0.7

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