openstack
/
swift
Code Issues Proposed changes

Merge "Update swift.common.db to us swift.cmmn.utils.json"

This commit is contained in:
Jenkins 2012-09-04 15:35:37 +00:00 committed by Gerrit Code Review
parent a8b8798f72 2e16b1f1e5
commit 93766cd28d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/common/db.py
View File

@ -29,10 +29,9 @@ import errno
from tempfile import mkstemp from tempfile import mkstemp
from eventlet import sleep, Timeout from eventlet import sleep, Timeout
import simplejson as json
import sqlite3 import sqlite3
from swift.common.utils import normalize_timestamp, renamer, \ from swift.common.utils import json, normalize_timestamp, renamer, \
mkdirs, lock_parent_directory, fallocate mkdirs, lock_parent_directory, fallocate
from swift.common.exceptions import LockTimeout from swift.common.exceptions import LockTimeout