Merge lp://qastaging/~1chb1n/charm-helpers/increase-amulet-deploy-timeout into lp://qastaging/charm-helpers

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 613
Proposed branch: lp://qastaging/~1chb1n/charm-helpers/increase-amulet-deploy-timeout
Merge into: lp://qastaging/charm-helpers
Diff against target: 21 lines (+7/-3)
1 file modified
charmhelpers/contrib/amulet/deployment.py (+7/-3)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charm-helpers/increase-amulet-deploy-timeout
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Ryan Beisner (community) Needs Fixing
James Page Pending
Review via email: mp+300750@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Actually, hang tight. I'm going to adjust this to consume env var AMULET_SETUP_TIMEOUT if set. Same as amulet itself does @ https://github.com/juju/amulet/blob/master/amulet/deployer.py#L642

review: Needs Fixing
Revision history for this message
Liam Young (gnuoy) wrote :

Minor nit

614. By Ryan Beisner

Adjust default value approach

Revision history for this message
Liam Young (gnuoy) :
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