Merge lp://staging/~lazypower/charm-helpers/learning-with-denis into lp://staging/~dbuliga/charm-helpers/charm-helpers
Proposed by
Charles Butler
| Status: | Merged |
|---|---|
| Merged at revision: | 520 |
| Proposed branch: | lp://staging/~lazypower/charm-helpers/learning-with-denis |
| Merge into: | lp://staging/~dbuliga/charm-helpers/charm-helpers |
| Diff against target: |
149 lines (+53/-9) 7 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+1/-1) charmhelpers/contrib/openstack/context.py (+11/-7) charmhelpers/contrib/openstack/neutron.py (+8/-0) charmhelpers/fetch/giturl.py (+3/-1) test_requirements.txt (+1/-0) tests/contrib/openstack/test_neutron_utils.py (+11/-0) tests/contrib/openstack/test_os_contexts.py (+18/-0) |
| To merge this branch: | bzr merge lp://staging/~lazypower/charm-helpers/learning-with-denis |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Denis Buliga | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixing of merge conflicts that cropped up during attempt to merge upstream
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
