Merge lp://qastaging/~bcsaller/charm-tools/fix-deps-again into lp://qastaging/charm-tools/1.6

Proposed by Marco Ceppi
Status: Merged
Merged at revision: 363
Proposed branch: lp://qastaging/~bcsaller/charm-tools/fix-deps-again
Merge into: lp://qastaging/charm-tools/1.6
Diff against target: 130 lines (+28/-12)
6 files modified
charmtools/compose/__init__.py (+1/-1)
charmtools/compose/tactics.py (+18/-8)
charmtools/fetchers.py (+6/-1)
tests/test_compose.py (+0/-2)
tests_functional/create/test_ansible_create.py (+1/-0)
tests_functional/create/test_python_create.py (+2/-0)
To merge this branch: bzr merge lp://qastaging/~bcsaller/charm-tools/fix-deps-again
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+270089@code.qastaging.launchpad.net
To post a comment you must log in.
364. By Benjamin Saller

fix tests, pip arguments changed

365. By Benjamin Saller

func test fallout, unrelated chagnes in CH

Revision history for this message
Benjamin Saller (bcsaller) wrote :

I'd thought this was merged, people are still seeing issues related to this.

Revision history for this message
Tim Van Steenburgh (tvansteenburgh) :
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