Merge lp://staging/~michael.nelson/rnr-server/support-options-for-server-status into lp://staging/rnr-server

Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: 241
Merged at revision: 239
Proposed branch: lp://staging/~michael.nelson/rnr-server/support-options-for-server-status
Merge into: lp://staging/rnr-server
Diff against target: 65 lines (+25/-3)
3 files modified
src/reviewsapp/api/handlers.py (+7/-1)
src/reviewsapp/api/urls.py (+12/-2)
src/reviewsapp/tests/test_handlers.py (+6/-0)
To merge this branch: bzr merge lp://staging/~michael.nelson/rnr-server/support-options-for-server-status
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+200399@code.staging.launchpad.net

Commit message

Enable OPTIONS request for server-status uri.

Description of the change

As part of the staging deploy update, we're using the api/2.0/server-status/ uri for haproxy checks, but piston resources don't support OPTIONS requests by default.

This update ensures that it does. Ideally it would be an upstream patch made to BaseResource, but piston doesn't seem to have an active upstream.

To post a comment you must log in.
241. By Michael Nelson

pep8 + docstring

Revision history for this message
Martin Albisetti (beuno) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches