Merge lp://staging/~makyo/charms/trusty/juju-gui/guiserver-v4bundle into lp://staging/charms/trusty/juju-gui
Proposed by
Madison Scott-Clary
| Status: | Merged |
|---|---|
| Merged at revision: | 110 |
| Proposed branch: | lp://staging/~makyo/charms/trusty/juju-gui/guiserver-v4bundle |
| Merge into: | lp://staging/charms/trusty/juju-gui |
| Diff against target: |
513 lines (+274/-27) 6 files modified
server/guiserver/bundles/__init__.py (+23/-7) server/guiserver/bundles/base.py (+4/-3) server/guiserver/bundles/views.py (+17/-4) server/guiserver/tests/bundles/test_base.py (+81/-7) server/guiserver/tests/bundles/test_views.py (+140/-4) server/guiserver/tests/helpers.py (+9/-2) |
| To merge this branch: | bzr merge lp://staging/~makyo/charms/trusty/juju-gui/guiserver-v4bundle |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju GUI Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Adds support for v4 (basketless) bundles as used by the charmstore. This retains legacy v3 functionality for the time being.
To post a comment you must log in.
Revision history for this message
| Francesco Banconi (frankban) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Madison,
could you please re-propose this against the development branch?
It's lp:~juju-gui/charms/trusty/juju-gui/trunk
Thank you.