openstack/swift
Code Issues Proposed changes

Merge "[Trivialfix]Fix typos in swift"

Browse Source
This commit is contained in:
Jenkins 2017-08-07 20:12:00 +00:00 committed by Gerrit Code Review
commit 7b2faca545
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/admin_guide.rst
View File

@ -1058,9 +1058,9 @@ Metric Name Description
deletion. deletion.
`container-sync.deletes.timing` Timing data for each container database row `container-sync.deletes.timing` Timing data for each container database row
synchronization via deletion. synchronization via deletion.
`container-sync.puts` Count of container database rows sync'ed by PUTing. `container-sync.puts` Count of container database rows sync'ed by Putting.
`container-sync.puts.timing` Timing data for each container database row `container-sync.puts.timing` Timing data for each container database row
synchronization via PUTing. synchronization via Putting.
=============================== ==================================================== =============================== ====================================================
Metrics for `container-updater`: Metrics for `container-updater`:

2
doc/source/deployment_guide.rst
View File

@ -668,7 +668,7 @@ eventlet_tpool_num_threads auto The number of threads in e
occur in separate IO threads, managed by occur in separate IO threads, managed by
eventlet. eventlet.
The default value is auto, whose actual value The default value is auto, whose actual value
is dependant on the servers_per_port value. is dependent on the servers_per_port value.
If servers_per_port is zero then it uses If servers_per_port is zero then it uses
eventlet's default (currently 20 threads). eventlet's default (currently 20 threads).
If the servers_per_port is nonzero then it'll If the servers_per_port is nonzero then it'll

2
etc/object-server.conf-sample
View File

@ -129,7 +129,7 @@ use = egg:swift#object
# in the object server's main thread, but certain "heavy" IO # in the object server's main thread, but certain "heavy" IO
# operations will occur in separate IO threads, managed by eventlet. # operations will occur in separate IO threads, managed by eventlet.
# #
# The default value is auto, whose actual value is dependant on the # The default value is auto, whose actual value is dependent on the
# servers_per_port value: # servers_per_port value:
# #
# - When servers_per_port is zero, the default value of # - When servers_per_port is zero, the default value of

2
test/unit/container/test_server.py
View File

@ -167,7 +167,7 @@ class TestContainerController(unittest.TestCase):
self.assertTrue(response.status.startswith('204')) self.assertTrue(response.status.startswith('204'))
self.assertNotIn('x-container-read', response.headers) self.assertNotIn('x-container-read', response.headers)
self.assertNotIn('x-container-write', response.headers) self.assertNotIn('x-container-write', response.headers)
# Ensure PUTing acls works # Ensure PUT acls works
req = Request.blank( req = Request.blank(
'/sda1/p/a/c2', environ={'REQUEST_METHOD': 'PUT'}, '/sda1/p/a/c2', environ={'REQUEST_METHOD': 'PUT'},
headers={'X-Timestamp': '4', 'X-Container-Read': '.r:*', headers={'X-Timestamp': '4', 'X-Container-Read': '.r:*',