Merge "Follow up patch to fix a multiline import NITPIC"

This commit is contained in:
Jenkins 2015-08-25 10:28:47 +00:00 committed by Gerrit Code Review
commit f7c235513c

View File

@ -31,8 +31,8 @@ from eventlet import Timeout, tpool
from test.unit import (debug_logger, patch_policies, make_timestamp_iter, from test.unit import (debug_logger, patch_policies, make_timestamp_iter,
mocked_http_conn) mocked_http_conn)
from swift.common import utils from swift.common import utils
from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \ from swift.common.utils import (hash_path, mkdirs, normalize_timestamp,
storage_directory storage_directory)
from swift.common import ring from swift.common import ring
from swift.obj import diskfile, replicator as object_replicator from swift.obj import diskfile, replicator as object_replicator
from swift.common.storage_policy import StoragePolicy, POLICIES from swift.common.storage_policy import StoragePolicy, POLICIES