]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-volume: import mock.mock instead of unittest.mock (py2) 32871/head
authorJan Fajerski <jfajerski@suse.com>
Fri, 22 Nov 2019 15:57:11 +0000 (16:57 +0100)
committerShyukri Shyukriev <shshyukriev@suse.com>
Sat, 25 Jan 2020 21:03:04 +0000 (23:03 +0200)
commitdad7bf5cb0681adbcd28a091c21a79797bf00096
tree127cd6cea99b5418e31e00305a19254ebb25bda1
parente1c5fd9306ce839d8d3ac8160c57aba42e0231a8
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