openstack
/
keystone
Code Issues Proposed changes

Merge "Replace openstack-common with oslo in docs"

This commit is contained in:
Jenkins 2013-06-11 18:45:59 +00:00 committed by Gerrit Code Review
parent 09d25f7750 a56b82b0aa
commit 6111bc9dfe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HACKING.rst
View File

@ -238,16 +238,16 @@ For more information on creating unit tests and utilizing the testing
infrastructure in OpenStack Nova, please read nova/testing/README.rst. infrastructure in OpenStack Nova, please read nova/testing/README.rst.
openstack-common oslo-incubator
---------------- ----------------
A number of modules from openstack-common are imported into the project. A number of modules from oslo-incubator are imported into the project.
These modules are "incubating" in openstack-common and are kept in sync These modules are "incubating" in oslo-incubator and are kept in sync
with the help of openstack-common's update.py script. See: with the help of oslo's update.py script. See:
http://wiki.openstack.org/CommonLibrary#Incubation https://wiki.openstack.org/wiki/Oslo#Incubation
The copy of the code should never be directly modified here. Please The copy of the code should never be directly modified here. Please
always update openstack-common first and then run the script to copy always update oslo-incubator first and then run the script to copy
the changes across. the changes across.

2
doc/source/middlewarearchitecture.rst
View File

@ -102,7 +102,7 @@ Deployment Strategy
=================== ===================
The middleware is intended to be used inline with OpenStack wsgi components, The middleware is intended to be used inline with OpenStack wsgi components,
based on the openstack-common WSGI middleware class. It is typically deployed based on the oslo WSGI middleware class. It is typically deployed
as a configuration element in a paste configuration pipeline of other as a configuration element in a paste configuration pipeline of other
middleware components, with the pipeline terminating in the service middleware components, with the pipeline terminating in the service
application. The middleware conforms to the python WSGI standard [PEP-333]_. application. The middleware conforms to the python WSGI standard [PEP-333]_.