juju-deployer

Merge lp://staging/~mthaddon/juju-deployer/lp-1892423 into lp://staging/juju-deployer

  1. lp-1892423
  2. Merge into trunk
Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 223
Merged at revision: 223
Proposed branch: lp://staging/~mthaddon/juju-deployer/lp-1892423
Merge into: lp://staging/juju-deployer
Diff against target: 53 lines (+13/-5)
3 files modified
deployer/deployment.py (+5/-2)
deployer/tests/test_data/blog.snippet (+2/-1)
deployer/tests/test_deployment.py (+6/-2)
To merge this branch: bzr merge lp://staging/~mthaddon/juju-deployer/lp-1892423
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Canonical IS Reviewers Pending
Review via email: mp+408802@code.staging.launchpad.net

Commit message

Update diff to deal correctly with include files lp#1892423

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

To confirm the functionality of this branch (in addition to running tests) I've tested with apache2:

https://pastebin.ubuntu.com/p/2SP5mTjrYM/

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Benjamin Allot (ballot) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 223

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