From 6aff48c6f1effc445633764e9d78b6f7c17f8b7e Mon Sep 17 00:00:00 2001
From: anc <alistair.coles@hp.com>
Date: Mon, 7 Jul 2014 12:32:44 +0100
Subject: [PATCH] Fix trivial typos

Fixes a few typos I have stumbled across recently.

Change-Id: Ib232924f6b23c08578c52a8dd63aaaa8789f9da7
---
 swift/common/utils.py               | 2 +-
 swift/container/backend.py          | 9 +++++----
 test/unit/common/ring/test_utils.py | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/swift/common/utils.py b/swift/common/utils.py
index 1281dc2888..f2393ead4a 100644
--- a/swift/common/utils.py
+++ b/swift/common/utils.py
@@ -632,7 +632,7 @@ class Timestamp(object):
         return INTERNAL_FORMAT % (self.timestamp, self.offset)
 
     def __str__(self):
-        raise TypeError('You must specificy which string format is required')
+        raise TypeError('You must specify which string format is required')
 
     def __float__(self):
         return self.timestamp
diff --git a/swift/container/backend.py b/swift/container/backend.py
index ff5129f142..b1bfa54bca 100644
--- a/swift/container/backend.py
+++ b/swift/container/backend.py
@@ -328,7 +328,7 @@ class ContainerBroker(DatabaseBroker):
         :param content_type: object content-type
         :param etag: object etag
         :param deleted: if True, marks the object as deleted and sets the
-                        deteleted_at timestamp to timestamp
+                        deleted_at timestamp to timestamp
         :param storage_policy_index: the storage policy index for the object
         """
         record = {'name': name, 'created_at': timestamp, 'size': size,
@@ -582,7 +582,7 @@ class ContainerBroker(DatabaseBroker):
         :param end_marker: end marker query
         :param prefix: prefix query
         :param delimiter: delimiter for query
-        :param path: if defined, will set the prefix and delimter based on
+        :param path: if defined, will set the prefix and delimiter based on
                      the path
 
         :returns: list of tuples of (name, created_at, size, content_type,
@@ -679,7 +679,7 @@ class ContainerBroker(DatabaseBroker):
                             break
                     elif end > 0:
                         marker = name[:end] + chr(ord(delimiter) + 1)
-                        # we want result to be inclusinve of delim+1
+                        # we want result to be inclusive of delim+1
                         delim_force_gte = True
                         dir_name = name[:end + 1]
                         if dir_name != orig_marker:
@@ -696,7 +696,8 @@ class ContainerBroker(DatabaseBroker):
         Merge items into the object table.
 
         :param item_list: list of dictionaries of {'name', 'created_at',
-                          'size', 'content_type', 'etag', 'deleted'}
+                          'size', 'content_type', 'etag', 'deleted',
+                          'storage_policy_index'}
         :param source: if defined, update incoming_sync with the source
         """
         def _really_merge_items(conn):
diff --git a/test/unit/common/ring/test_utils.py b/test/unit/common/ring/test_utils.py
index 80c695c819..849bf6383c 100644
--- a/test/unit/common/ring/test_utils.py
+++ b/test/unit/common/ring/test_utils.py
@@ -149,7 +149,7 @@ class TestUtils(unittest.TestCase):
         self.assertEquals((
             'container.builder', 'container.ring.gz'
         ), parse_builder_ring_filename_args(args.split()))
-        # builer name arg should always fall through
+        # builder name arg should always fall through
         args = 'swift-ring-builder test create'
         self.assertEquals((
             'test', 'test.ring.gz'