← Back to branch summary

~salvatore-orlando/neutron/quantum-api

« back to all changes in this revision

Viewing changes to quantum/api/__init__.py

  • Committer: Salvatore Orlando
  • Date: 2011-06-24 13:52:17 UTC
  • mfrom: (6.1.14 quantum-trunk)
  • Revision ID: salvatore.orlando@eu.citrix.com-20110624135217-h6uz1zu3fxxpf3wt
Merge trunk
Resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/api/__init__.py
20
20
"""
21
21
 
22
22
import logging
 
23
import pprint
23
24
import routes
24
25
import webob.dec
25
26
import webob.exc