Merge lp://staging/~gary/charms/precise/juju-gui/update into lp://staging/charms/juju-gui
Proposed by
Gary Poster
| Status: | Merged |
|---|---|
| Merged at revision: | 67 |
| Proposed branch: | lp://staging/~gary/charms/precise/juju-gui/update |
| Merge into: | lp://staging/charms/juju-gui |
| Diff against target: |
2940 lines (+2185/-234) 31 files modified
.bzrignore (+1/-0) .lbox (+1/-0) .lbox.check (+3/-0) COPYING (+661/-0) Dependencies.md (+9/-2) HACKING.md (+70/-82) Makefile (+63/-0) README.md (+10/-1) config.yaml (+44/-1) config/config.js.template (+4/-1) copyright (+3/-3) hooks/backend.py (+21/-1) hooks/bootstrap_utils.py (+16/-0) hooks/config-changed (+15/-2) hooks/install (+16/-0) hooks/start (+16/-0) hooks/stop (+16/-0) hooks/utils.py (+40/-9) hooks/web-relation-joined (+16/-0) metadata.yaml (+16/-0) revision (+1/-1) tests/00-setup (+36/-0) tests/10-unit.test (+21/-3) tests/20-functional.test (+61/-99) tests/deploy.py (+80/-0) tests/helpers.py (+185/-0) tests/requirements.pip (+28/-0) tests/test_backends.py (+24/-6) tests/test_deploy.py (+196/-0) tests/test_helpers.py (+397/-0) tests/test_utils.py (+115/-23) |
| To merge this branch: | bzr merge lp://staging/~gary/charms/precise/juju-gui/update |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gary Poster (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge work from ~juju-gui. This adds support for a number of GUI options, license file changes, and new test infrastructure.
Description of the change
Merge work from ~juju-gui. This adds support for a number of GUI options, license file changes, and new test infrastructure.
To post a comment you must log in.
Revision history for this message
| Gary Poster (gary) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
