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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Ryan Beisner (community) | Needs Fixing | ||
James Page | Pending | ||
Review via email:
|
Description of the change
To post a comment you must log in.
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