From 438410a97a12402daa5b417d151d5c7152063f96 Mon Sep 17 00:00:00 2001 From: Sam Lang Date: Fri, 12 Apr 2013 12:55:54 -0500 Subject: [PATCH] lock: Fix import cycle breakage fa2049f caused an import cycle between lock.py and misc.py. Move the needed functions from lock.py to lockstatus.py so that we can avoid the import cycle. Signed-off-by: Sam Lang Conflicts: teuthology/lock.py --- teuthology/lockstatus.py | 1 - 1 file changed, 1 deletion(-) diff --git a/teuthology/lockstatus.py b/teuthology/lockstatus.py index 9e63614a6e6a6..21d6375f909e4 100644 --- a/teuthology/lockstatus.py +++ b/teuthology/lockstatus.py @@ -22,4 +22,3 @@ def get_status(ctx, name): return json.loads(content) return None - -- 2.39.5