summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-18 08:01:07 +0000
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-18 08:01:07 +0000
commitdde92454697b23a02abd573feeea13fec0bd8a9a (patch)
tree7d082acbb041b340e586cf5cd1bb65de6613cbd8 /etc
parentd1958f61e5573b6a4101564e6e4b1969000eccca (diff)
parentabe147f756f13d4f968aa075d709e5c6643d310a (diff)
downloadnova-dde92454697b23a02abd573feeea13fec0bd8a9a.tar.gz
nova-dde92454697b23a02abd573feeea13fec0bd8a9a.tar.xz
nova-dde92454697b23a02abd573feeea13fec0bd8a9a.zip
merge trunk
Diffstat (limited to 'etc')
-rw-r--r--etc/api-paste.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index 9f7e93d4c..a4483d3f8 100644
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -68,6 +68,7 @@ paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.f
use = egg:Paste#urlmap
/: osversions
/v1.0: openstackapi
+/v1.1: openstackapi
[pipeline:openstackapi]
pipeline = faultwrap auth ratelimit osapiapp