Merge lp://staging/~sinzui/charmworld/add-api-3 into lp://staging/~juju-jitsu/charmworld/trunk
Proposed by
Curtis Hovey
| Status: | Merged |
|---|---|
| Merged at revision: | 351 |
| Proposed branch: | lp://staging/~sinzui/charmworld/add-api-3 |
| Merge into: | lp://staging/~juju-jitsu/charmworld/trunk |
| Diff against target: |
327 lines (+110/-28) 9 files modified
charmworld/health.py (+25/-4) charmworld/routes.py (+5/-0) charmworld/tests/test_health.py (+29/-10) charmworld/views/api.py (+18/-4) charmworld/views/charms.py (+3/-3) charmworld/views/misc.py (+4/-2) charmworld/views/tests/test_api.py (+18/-0) charmworld/views/tests/test_charms.py (+2/-2) charmworld/views/tests/test_misc.py (+6/-3) |
| To merge this branch: | bzr merge lp://staging/~sinzui/charmworld/add-api-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Aaron Bentley (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Introduce API3. Identical to API2, but will change soon.
Description of the change
Introduce API3. Identical to API2, but will change soon.
RULES
Pre-
* Add API3. Rename API2 to API3, Add API2 back as an extension of API3
so that we can trivially remove API2 when it is obsolete.
* Add health checks for API3.
QA
* Visit http://
* Verify API2 and and API3 are listed and pass.
To post a comment you must log in.
Revision history for this message
| Aaron Bentley (abentley) | # |
review:
Approve
Revision history for this message
| Charmworld Lander (charmworld-lander) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.