OpenStack Object Storage (swift)

Merge lp:~notmyname/swift/utils_bug into lp:~hudson-openstack/swift/trunk

  1. utils_bug
  2. Merge into trunk
Proposed by John Dickinson
Status: Merged
Approved by: Chuck Thier
Approved revision: 68
Merged at revision: 68
Proposed branch: lp:~notmyname/swift/utils_bug
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
swift/common/utils.py (+1/-1)
To merge this branch: bzr merge lp:~notmyname/swift/utils_bug
Reviewer Review Type Date Requested Status
Chuck Thier (community) Approve
Review via email: mp+34429@code.launchpad.net

Commit message

pass through the timeout parameter for calls to lock_parent_directory

Description of the change

pass through the timeout parameter for calls to lock_parent_directory

To post a comment you must log in.
Revision history for this message
Chuck Thier (cthier) wrote :

k

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'swift/common/utils.py'
2--- swift/common/utils.py 2010-08-31 23:12:59 +0000
3+++ swift/common/utils.py 2010-09-02 15:00:56 +0000
4@@ -442,7 +442,7 @@
5 :param filename: file path of the parent directory to be locked
6 :param timeout: timeout (in seconds)
7 """
8- return lock_path(os.path.dirname(filename))
9+ return lock_path(os.path.dirname(filename), timeout=timeout)
10
11
12 def get_time_units(time_amount):