Merge pull request #22515 from ceph/backport-mimic-21803

author Alfredo Deza <alfredo@deza.pe>

Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)

committer GitHub <noreply@github.com>

Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)
author Alfredo Deza <alfredo@deza.pe>
Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)
committer GitHub <noreply@github.com>
Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)
diff --cc src/ceph-volume/ceph_volume/util/system.py
Simple merge
author	Alfredo Deza <alfredo@deza.pe>
	Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)
committer	GitHub <noreply@github.com>
	Wed, 13 Jun 2018 17:47:48 +0000 (13:47 -0400)