diff options
| author | venkata edara <redara@redhat.com> | 2017-05-10 13:27:38 +0530 |
|---|---|---|
| committer | Prashanth Pai <ppai@redhat.com> | 2017-05-11 05:48:27 +0000 |
| commit | 513988915aa1af13a989d062b021fe1562cbf18d (patch) | |
| tree | 1c281911e3a9bfa97f8a7285f20691cb77c45c1d /gluster/swift/obj/expirer.py | |
| parent | e9c2c5eb55e1012ccce0ce51ac48bed0c0f1d4b7 (diff) | |
Rebase to Swift 2.10.1 (newton)
Change-Id: I53a962c9a301089c8aed0b43c50f944c30225944
Signed-off-by: venkata edara <redara@redhat.com>
Reviewed-on: https://review.gluster.org/16653
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Tested-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'gluster/swift/obj/expirer.py')
| -rw-r--r-- | gluster/swift/obj/expirer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gluster/swift/obj/expirer.py b/gluster/swift/obj/expirer.py index 38f870e..97e08e9 100644 --- a/gluster/swift/obj/expirer.py +++ b/gluster/swift/obj/expirer.py @@ -25,7 +25,7 @@ from gluster.swift.common.utils import delete_tracker_object from swift.obj.expirer import ObjectExpirer as SwiftObjectExpirer from swift.common.http import HTTP_NOT_FOUND from swift.common.internal_client import InternalClient, UnexpectedResponse -from swift.common.utils import ThreadPool +from gluster.swift.common.utils import ThreadPool EXCLUDE_DIRS = ('.trashcan', '.glusterfs') |