diff --git a/doc/source/replication_network.rst b/doc/source/replication_network.rst index 6a6f8e99fd..138cb42186 100644 --- a/doc/source/replication_network.rst +++ b/doc/source/replication_network.rst @@ -134,7 +134,7 @@ For SAIO replication read only = false lock file = /var/lock/object6080.lock -#. Restart rsync deamon:: +#. Restart rsync daemon:: service rsync restart diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample index 97d6eabca3..6a7fcb929b 100644 --- a/etc/account-server.conf-sample +++ b/etc/account-server.conf-sample @@ -157,7 +157,7 @@ use = egg:swift#recon # requested by delay_reaping. # reap_warn_after = 2592000 -# Note: Put it at the beginning of the pipleline to profile all middleware. But +# Note: Put it at the beginning of the pipeline to profile all middleware. But # it is safer to put this after healthcheck. [filter:xprofile] use = egg:swift#xprofile diff --git a/etc/container-server.conf-sample b/etc/container-server.conf-sample index 6ded6d6dbf..de511368ad 100644 --- a/etc/container-server.conf-sample +++ b/etc/container-server.conf-sample @@ -168,7 +168,7 @@ use = egg:swift#recon # Maximum amount of time to spend syncing each container per pass # container_time = 60 -# Note: Put it at the beginning of the pipleline to profile all middleware. But +# Note: Put it at the beginning of the pipeline to profile all middleware. But # it is safer to put this after healthcheck. [filter:xprofile] use = egg:swift#xprofile diff --git a/swift/common/storage_policy.py b/swift/common/storage_policy.py index 4cd95a5d9e..245e3c325b 100644 --- a/swift/common/storage_policy.py +++ b/swift/common/storage_policy.py @@ -281,7 +281,7 @@ def parse_storage_policies(conf): if not section.startswith('storage-policy:'): continue policy_index = section.split(':', 1)[1] - # map config option name to StoragePolicy paramater name + # map config option name to StoragePolicy parameter name config_to_policy_option_map = { 'name': 'name', 'default': 'is_default', diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py index ac07a18cf6..728ec594de 100644 --- a/swift/proxy/controllers/base.py +++ b/swift/proxy/controllers/base.py @@ -388,7 +388,7 @@ def _set_info_cache(app, env, account, container, resp): else: cache_time = None - # Next actually set both memcache and the env chache + # Next actually set both memcache and the env cache memcache = getattr(app, 'memcache', None) or env.get('swift.cache') if not cache_time: env.pop(env_key, None) diff --git a/test/sample.conf b/test/sample.conf index 4a7b5684ca..9f20ac9e4f 100644 --- a/test/sample.conf +++ b/test/sample.conf @@ -35,7 +35,7 @@ password3 = testing3 collate = C -# Only necessary if a pre-exising server uses self-signed certificate +# Only necessary if a pre-existing server uses self-signed certificate insecure = no [unit_test] diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py index cda8e9a2f0..74c1c910a1 100644 --- a/test/unit/obj/test_replicator.py +++ b/test/unit/obj/test_replicator.py @@ -561,7 +561,7 @@ class TestObjectReplicator(unittest.TestCase): try: object_replicator.http_connect = mock_http_connect(200) # Write some files into '1' and run replicate- they should be moved - # to the other partitoins and then node should get deleted. + # to the other partitions and then node should get deleted. cur_part = '1' df = self.df_mgr.get_diskfile('sda', cur_part, 'a', 'c', 'o') mkdirs(df._datadir) @@ -751,7 +751,7 @@ class TestObjectReplicator(unittest.TestCase): resp.read.return_value = pickle.dumps({}) for job in jobs: set_default(self) - # limit local job to policy 0 for simplicty + # limit local job to policy 0 for simplicity if job['partition'] == '0' and job['policy_idx'] == 0: local_job = job.copy() continue @@ -790,7 +790,7 @@ class TestObjectReplicator(unittest.TestCase): node['replication_ip'] = '127.0.0.11' node['replication_port'] = '6011' set_default(self) - # with only one set of headers make sure we speicy index 0 here + # with only one set of headers make sure we specify index 0 here # as otherwise it may be different from earlier tests self.headers['X-Backend-Storage-Policy-Index'] = 0 self.replicator.update(repl_job) diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py index e2137484ef..3e45c6fbe6 100755 --- a/test/unit/obj/test_server.py +++ b/test/unit/obj/test_server.py @@ -520,7 +520,7 @@ class TestObjectController(unittest.TestCase): self.assertEquals(resp.status_int, 412) def test_PUT_if_none_match(self): - # PUT with if-none-match set and nothing there should succede + # PUT with if-none-match set and nothing there should succeed timestamp = normalize_timestamp(time()) req = Request.blank( '/sda1/p/a/c/o', environ={'REQUEST_METHOD': 'PUT'},