From 513988915aa1af13a989d062b021fe1562cbf18d Mon Sep 17 00:00:00 2001 From: venkata edara Date: Wed, 10 May 2017 13:27:38 +0530 Subject: Rebase to Swift 2.10.1 (newton) Change-Id: I53a962c9a301089c8aed0b43c50f944c30225944 Signed-off-by: venkata edara Reviewed-on: https://review.gluster.org/16653 Reviewed-by: Prashanth Pai Tested-by: Prashanth Pai --- test/unit/obj/test_diskfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/unit/obj/test_diskfile.py') diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py index 9701f44..2aed737 100644 --- a/test/unit/obj/test_diskfile.py +++ b/test/unit/obj/test_diskfile.py @@ -31,7 +31,7 @@ from gluster.swift.common.exceptions import AlreadyExistsAsDir, \ AlreadyExistsAsFile from swift.common.exceptions import DiskFileNoSpace, DiskFileNotOpen, \ DiskFileNotExist, DiskFileExpired -from swift.common.utils import ThreadPool +from gluster.swift.common.utils import ThreadPool import gluster.swift.common.utils from gluster.swift.common.utils import normalize_timestamp -- cgit