Merge lp:~mthaddon/mojo/charm-testing-squid into lp:mojo/mojo-specs
Proposed by
Tom Haddon
Status: | Work in progress |
---|---|
Proposed branch: | lp:~mthaddon/mojo/charm-testing-squid |
Merge into: | lp:mojo/mojo-specs |
Diff against target: |
101 lines (+79/-0) (has conflicts) 4 files modified
charm-testing/squid-reverseproxy/collect (+6/-0) charm-testing/squid-reverseproxy/deploy (+20/-0) charm-testing/squid-reverseproxy/post-deploy (+49/-0) charm-testing/squid-reverseproxy/templates/vhost-http.tmpl (+4/-0) Conflict adding file charm-testing/squid-reverseproxy. Moved existing file to charm-testing/squid-reverseproxy.moved. |
To merge this branch: | bzr merge lp:~mthaddon/mojo/charm-testing-squid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mojo Maintainers | Pending | ||
Review via email: mp+349645@code.launchpad.net |
Commit message
Charm testing spec for squid-reverseproxy
Description of the change
Charm testing spec for squid-reverseproxy
To post a comment you must log in.
Unmerged revisions
- 94. By Tom Haddon
-
Charm testing spec for squid-reverseproxy