Merge pull request #32861 from shyukri/wip-43282-mimic

author Jan Fajerski <jan--f@users.noreply.github.com>

Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)

committer GitHub <noreply@github.com>

Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)
author Jan Fajerski <jan--f@users.noreply.github.com>
Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)
committer GitHub <noreply@github.com>
Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)
diff --cc src/ceph-volume/ceph_volume/tests/util/test_system.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/util/system.py
Simple merge
author	Jan Fajerski <jan--f@users.noreply.github.com>
	Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)
committer	GitHub <noreply@github.com>
	Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)
		1	2
src/ceph-volume/ceph_volume/tests/util/test_system.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/util/system.py	patch \|	diff1 \|	diff2 \|	blob \| history