/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/controllers/annotate_ui.py

  • Committer: Michael Hudson
  • Date: 2008-06-16 11:25:25 UTC
  • mfrom: (160 trunk)
  • mto: This revision was merged to the branch mainline in revision 164.
  • Revision ID: michael.hudson@canonical.com-20080616112525-t1vsjh4s3knwpou3
merge trunk, rather brutally resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/annotate_ui.py
105
105
                'url': self._branch.context_url,
106
106
            }
107
107
            vals.update(templatefunctions)
108
 
            h.flush_cache()
109
108
            self.log.info('/annotate: %r secs' % (time.time() - z,))
110
109
            response.headers['Content-Type'] = 'text/html'
111
110
            tt.expand_(response, **vals)