Merge pull request #25469 from sebastian-philipp/ceph-volume-fix-join

author Alfredo Deza <alfredo@deza.pe>

Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)

committer GitHub <noreply@github.com>

Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)
author Alfredo Deza <alfredo@deza.pe>
Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)
committer GitHub <noreply@github.com>
Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)
diff --cc src/ceph-volume/ceph_volume/tests/util/test_device.py
Simple merge
diff --cc src/ceph-volume/ceph_volume/util/device.py
Simple merge
author	Alfredo Deza <alfredo@deza.pe>
	Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)
committer	GitHub <noreply@github.com>
	Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)
		1	2
src/ceph-volume/ceph_volume/tests/util/test_device.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph-volume/ceph_volume/util/device.py	patch \|	diff1 \|	diff2 \|	blob \| history