]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-volume: import mock.mock instead of unittest.mock (py2) 32870/head
authorJan Fajerski <jfajerski@suse.com>
Fri, 22 Nov 2019 15:57:11 +0000 (16:57 +0100)
committerShyukri Shyukriev <shshyukriev@suse.com>
Sat, 8 Feb 2020 20:31:37 +0000 (22:31 +0200)
commit2dab9b20fab659165703e70706923d1ed57011dd
tree382666b0c016a66543133be0cba7f011cdd64431
parente28dea68b07adb8402e164bbe1ba959dc1dfef4b
ceph-volume: import mock.mock instead of unittest.mock (py2)

Fixes: bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657
Fixes: https://tracker.ceph.com/issues/42970
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit c1bd09f2591d983f1988e3dadcf3c65c59afb15d)

Conflicts:
src/ceph-volume/ceph_volume/tests/api/test_lvm.py
src/ceph-volume/ceph_volume/tests/api/test_lvm.py