Merge lp:~halkeye/graphite/graphite into lp:~graphite-dev/graphite/main
Proposed by
Gavin
Status: | Merged |
---|---|
Merged at revision: | 755 |
Proposed branch: | lp:~halkeye/graphite/graphite |
Merge into: | lp:~graphite-dev/graphite/main |
Diff against target: |
66 lines (+25/-9) 2 files modified
webapp/graphite/browser/views.py (+15/-5) webapp/graphite/graphlot/views.py (+10/-4) |
To merge this branch: | bzr merge lp:~halkeye/graphite/graphite |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Leinartas | Approve | ||
Review via email: mp+101461@code.launchpad.net |
Description of the change
add callback=? cgi variable to the usergraph tree so dashboards on a different domain can get pre-created graphs.
To post a comment you must log in.
This looks good, however I saw this merge request too late (sorry) and already merged in basically the same thing in r745 - sorry about that. The difference is that the parameter is called 'jsonp' rather than 'callback', however it works the same way.
r745 didn't have the /graphlot endpoint done as you did so I'm going to make the change to it as you have as well.
Thanks for the contribution