Merge "OpenStack typo"

This commit is contained in:
Jenkins 2015-12-04 15:07:28 +00:00 committed by Gerrit Code Review
commit c5bd342d33
4 changed files with 4 additions and 4 deletions

View File

@ -32,7 +32,7 @@ and the V2.1 plugins live in ``nova/api/openstack/compute``.
Note that any change to the Nova API to be merged will first require a Note that any change to the Nova API to be merged will first require a
spec be approved first. See `here <https://github.com/openstack/nova-specs>`_ spec be approved first. See `here <https://github.com/openstack/nova-specs>`_
for the appropriate repository. For guidance on the design of the API for the appropriate repository. For guidance on the design of the API
please refer to the `Openstack API WG please refer to the `OpenStack API WG
<https://wiki.openstack.org/wiki/API_Working_Group>`_ <https://wiki.openstack.org/wiki/API_Working_Group>`_

View File

@ -15,7 +15,7 @@ paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
# EC2 # # EC2 #
####### #######
# NOTE: this is now deprecated in favor of https://github.com/stackforge/ec2-api # NOTE: this is now deprecated in favor of https://github.com/openstack/ec2-api
[composite:ec2] [composite:ec2]
use = egg:Paste#urlmap use = egg:Paste#urlmap
/: ec2cloud /: ec2cloud

View File

@ -391,7 +391,7 @@ def check_compute_policy(context, action, target, scope='compute'):
# NOTE(alex_xu): The functions os_compute_authorizer and # NOTE(alex_xu): The functions os_compute_authorizer and
# os_compute_soft_authorizer are used to policy enforcement for Openstack # os_compute_soft_authorizer are used to policy enforcement for OpenStack
# Compute API, now Nova V2.1 REST API will invoke it. # Compute API, now Nova V2.1 REST API will invoke it.
# #

View File

@ -15,7 +15,7 @@
# #
"""Base proxy module used to create compatible consoles """Base proxy module used to create compatible consoles
for Openstack Nova.""" for OpenStack Nova."""
import os import os
import sys import sys