openstack/octavia
Code Issues Proposed changes

Merge "Repalce Chinese quotes to English quotes"

Browse Source
This commit is contained in:
Zuul 2018-02-06 03:42:26 +00:00 committed by Gerrit Code Review
commit 8846bb88e9
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v2/l7policy.inc
View File

@ -96,7 +96,7 @@ response body. Validation errors require that you correct the error
and submit the request again. and submit the request again.
All the rules associated with a given policy are logically ANDed together. A All the rules associated with a given policy are logically ANDed together. A
request must match all the policy’s rules to match the policy. request must match all the policy's rules to match the policy.
If you need to express a logical OR operation between rules, then do this by If you need to express a logical OR operation between rules, then do this by
creating multiple policies with the same action. creating multiple policies with the same action.

2
api-ref/source/v2/l7rule.inc
View File

@ -94,7 +94,7 @@ response body. Validation errors require that you correct the error
and submit the request again. and submit the request again.
All the rules associated with a given policy are logically ANDed together. A All the rules associated with a given policy are logically ANDed together. A
request must match all the policy’s rules to match the policy. request must match all the policy's rules to match the policy.
If you need to express a logical OR operation between rules, then do this by If you need to express a logical OR operation between rules, then do this by
creating multiple policies with the same action. creating multiple policies with the same action.

4
doc/source/reference/introduction.rst
View File

@ -62,7 +62,7 @@ In accomplishing its role, Octavia makes use of other OpenStack projects:
configuration and management. configuration and management.
Octavia is designed to interact with the components listed previously. In each Octavia is designed to interact with the components listed previously. In each
case, we’ve taken care to define this interaction through a driver interface. case, we've taken care to define this interaction through a driver interface.
That way, external components can be swapped out with functionally-equivalent That way, external components can be swapped out with functionally-equivalent
replacements— without having to restructure major components of Octavia. For replacements— without having to restructure major components of Octavia. For
example, if you use an SDN solution other than Neutron in your environment, it example, if you use an SDN solution other than Neutron in your environment, it
@ -97,7 +97,7 @@ terms as they are defined and used within the context of the Octavia project
and Neutron LBaaS version 2. This glossary is available here: :doc:`glossary` and Neutron LBaaS version 2. This glossary is available here: :doc:`glossary`
If you are familiar with Neutron LBaaS version 1 terms and usage, it is If you are familiar with Neutron LBaaS version 1 terms and usage, it is
especially important for you to understand how the meanings of the terms “VIP," especially important for you to understand how the meanings of the terms "VIP,"
"load balancer," and "load balancing," have changed in Neutron LBaaS version 2. "load balancer," and "load balancing," have changed in Neutron LBaaS version 2.
Our use of these terms should remain consistent with the :doc:`glossary` Our use of these terms should remain consistent with the :doc:`glossary`

2
specs/version0.9/active-active-topology.rst
View File

@ -373,7 +373,7 @@ Network driver changes
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
* Support the creation, connection, and configuration of the various * Support the creation, connection, and configuration of the various
networks and interfaces as described in ‘high-level topology' diagram. networks and interfaces as described in 'high-level topology' diagram.
* Adding a new loadbalancer requires attaching the Distributor to the * Adding a new loadbalancer requires attaching the Distributor to the
loadbalancer's front-end network, adding a VIP port to the Distributor, loadbalancer's front-end network, adding a VIP port to the Distributor,

8
specs/version1.1/enable-provider-driver.rst
View File

@ -776,12 +776,12 @@ Member
Existing members are matched based on address/port combination. Existing members are matched based on address/port combination.
For example, assume a pool currently has two members. These members have the For example, assume a pool currently has two members. These members have the
following address/port combinations: ‘192.0.2.15:80’ and ‘192.0.2.16:80’. following address/port combinations: '192.0.2.15:80' and '192.0.2.16:80'.
Now assume a PUT request is made that includes members with address/port Now assume a PUT request is made that includes members with address/port
combinations: ‘192.0.2.16:80’ and ‘192.0.2.17:80’. The member ‘192.0.2.15:80’ combinations: '192.0.2.16:80' and '192.0.2.17:80'. The member '192.0.2.15:80'
will be deleted because it was not in the request. The member ‘192.0.2.16:80’ will be deleted because it was not in the request. The member '192.0.2.16:80'
will be updated to match the request data for that member, because it was will be updated to match the request data for that member, because it was
matched. The member ‘192.0.2.17:80’ will be created, because no such member matched. The member '192.0.2.17:80' will be created, because no such member
existed. existed.
The members will be in the ``PENDING_CREATE``, ``PENDING_UPDATE``, or The members will be in the ``PENDING_CREATE``, ``PENDING_UPDATE``, or

2
tox.ini
View File

@ -125,7 +125,7 @@ show-source = true
builtins = _ builtins = _
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
import-order-style = pep8 import-order-style = pep8
# [H106]: Don’t put vim configuration in source files # [H106]: Don't put vim configuration in source files
# [H203]: Use assertIs(Not)None to check for None # [H203]: Use assertIs(Not)None to check for None
# [H904] Delay string interpolations at logging calls. # [H904] Delay string interpolations at logging calls.
enable-extensions=H106,H203,H904 enable-extensions=H106,H203,H904