diff --git a/doc/source/api/temporary_url_middleware.rst b/doc/source/api/temporary_url_middleware.rst index 78952503f7..9acb31cadb 100644 --- a/doc/source/api/temporary_url_middleware.rst +++ b/doc/source/api/temporary_url_middleware.rst @@ -189,8 +189,8 @@ you can use following code snippet: import time time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(timestamp)) -Using the ``swift`` tool to generate a Temporary URL -~~~~~~~~~~~~~~~~~~~~~ +Using the ``swift`` tool to generate a Temporary URL +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ``swift`` tool provides the tempurl_ option that auto-generates the *``temp_url_sig``* and *``temp_url_expires``* query diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py index 37fe51de54..f01dad1711 100644 --- a/swift/obj/diskfile.py +++ b/swift/obj/diskfile.py @@ -793,11 +793,11 @@ class BaseDiskFileManager(object): data_info -> a file info dict for a .data file meta_info -> a file info dict for a .meta file ctype_info -> a file info dict for a .meta file which - contains the content-type value + contains the content-type value unexpected -> a list of file paths for unexpected - files + files possible_reclaim -> a list of file info dicts for possible - reclaimable files + reclaimable files obsolete -> a list of file info dicts for obsolete files """ # Build the exts data structure: diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py index be98bc15dd..5df5370de5 100644 --- a/swift/proxy/controllers/base.py +++ b/swift/proxy/controllers/base.py @@ -1356,6 +1356,7 @@ class NodeIter(object): Install a callback function that will be used during a call to next() to get an alternate node instead of returning the next node from the iterator. + :param callback: A no argument function that should return a node dict or None. """