Juju Charms Collection
juju-gui package

Merge lp://qastaging/~frankban/charms/trusty/juju-gui/proto-changeset into lp://qastaging/~juju-gui/charms/trusty/juju-gui/trunk

Proposed by Francesco Banconi on 2015-04-21

Status:	Merged
Merged at revision:	252
Proposed branch:	lp://qastaging/~frankban/charms/trusty/juju-gui/proto-changeset
Merge into:	lp://qastaging/~juju-gui/charms/trusty/juju-gui/trunk
Diff against target:	1013 lines (+695/-46) 14 files modified server-requirements.pip (+1/-0) server/guiserver/__init__.py (+1/-1) server/guiserver/apps.py (+6/-1) server/guiserver/bundles/__init__.py (+128/-0) server/guiserver/bundles/base.py (+48/-1) server/guiserver/bundles/utils.py (+6/-5) server/guiserver/bundles/views.py (+116/-0) server/guiserver/handlers.py (+61/-15) server/guiserver/tests/bundles/test_utils.py (+6/-6) server/guiserver/tests/bundles/test_views.py (+207/-0) server/guiserver/tests/helpers.py (+7/-0) server/guiserver/tests/test_apps.py (+5/-4) server/guiserver/tests/test_auth.py (+2/-8) server/guiserver/tests/test_handlers.py (+101/-5)
To merge this branch:	bzr merge lp://qastaging/~frankban/charms/trusty/juju-gui/proto-changeset
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2015-04-21	Pending
Review via email: mp+256979@code.qastaging.launchpad.net

Description of the change

Implement the change set API.

The new WebSocket endpoints are described in the
MP, and will be used by the Juju GUI and by
quickstart to generate the uncommitted state of
bundles.

https://codereview.appspot.com/232830043/

Revision history for this message

Francesco Banconi (frankban) wrote on 2015-04-21:

Reviewers: mp+256979_code.launchpad.net,

Message:
Please take a look.

Description:
Implement the change set API.

The new WebSocket endpoints are described in the
MP, and will be used by the Juju GUI and by
quickstart to generate the uncommitted state of
bundles.

https://code.launchpad.net/~frankban/charms/trusty/juju-gui/proto-changeset/+merge/256979

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/232830043/

Affected files (+434, -0 lines):
   A [revision details]
   A deps/jujubundlelib-0.1.2.tar.gz
   M server-requirements.pip
   M server/guiserver/__init__.py
   M server/guiserver/bundles/__init__.py
   M server/guiserver/bundles/base.py
   M server/guiserver/bundles/views.py
   M server/guiserver/tests/bundles/test_views.py