Merge lp://qastaging/~corey.bryant/charm-helpers/timeouts into lp://qastaging/charm-helpers
Proposed by
Corey Bryant
| Status: | Merged |
|---|---|
| Merged at revision: | 185 |
| Proposed branch: | lp://qastaging/~corey.bryant/charm-helpers/timeouts |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
442 lines (+165/-61) 4 files modified
charmhelpers/contrib/amulet/deployment.py (+20/-7) charmhelpers/contrib/amulet/utils.py (+46/-27) charmhelpers/contrib/openstack/amulet/deployment.py (+13/-7) charmhelpers/contrib/openstack/amulet/utils.py (+86/-20) |
| To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charm-helpers/timeouts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
