← Back to branch summary

~graphite-dev/graphite/1.1

« back to all changes in this revision

Viewing changes to webapp/graphite/render/views.py

  • Committer: Chris Davis
  • Date: 2011-08-08 03:32:25 UTC
  • mfrom: (337.5.115 trunk)
  • Revision ID: chrismd@gmail.com-20110808033225-oncjaxk2pvd6651m
cherrypicking trunk revs 450-460

Show diffs side-by-side

added added

removed removed

Lines of Context:
webapp/graphite/render/views.py
136
136
        datapoints = zip(series, timestamps)
137
137
        series_data.append( dict(target=series.name, datapoints=datapoints) )
138
138
 
139
 
      response = HttpResponse(content=json.dumps(series_data), mimetype='text/json')
 
139
      response = HttpResponse(content=json.dumps(series_data), mimetype='application/json')
140
140
      response['Pragma'] = 'no-cache'
141
141
      response['Cache-Control'] = 'no-cache'
142
142
      return response