Merge lp://staging/~gary/juju-gui/bug1169350 into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 565 |
Proposed branch: | lp://staging/~gary/juju-gui/bug1169350 |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
264 lines (+53/-63) 6 files modified
app/store/env/fakebackend.js (+2/-0) app/views/topology/relation.js (+1/-1) test/test_app.js (+1/-2) test/test_fakebackend.js (+18/-20) test/test_sandbox.js (+1/-1) test/utils.js (+30/-39) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/bug1169350 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+159271@code.staging.launchpad.net |
Description of the change
gallimaufry
Title is in homage to benji's potpourri.
- Fix 1169350: sandbox was not marking subordinate charms correctly.
- Fix 1169668: subordinate relations were not shown because of the id change.
- Simplify test charm store code.
To post a comment you must log in.
Reviewers: mp+159271_ code.launchpad. net,
Message:
Please take a look.
Description:
gallimaufry
Title is in homage to benji's potpourri.
- Fix 1169350: sandbox was not marking subordinate charms correctly.
- Fix 1169668: subordinate relations were not shown because of the id
change.
- Simplify test charm store code.
https:/ /code.launchpad .net/~gary/ juju-gui/ bug1169350/ +merge/ 159271
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/8812043/
Affected files: env/fakebackend .js topology/ relation. js fakebackend. js sandbox. js
A [revision details]
M app/store/
M app/views/
M test/test_app.js
M test/test_
M test/test_
M test/utils.js