Merge pull request #18037 from ajarr/wip-21602-luminous

author Sage Weil <sage@newdream.net>

Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)

committer GitHub <noreply@github.com>

Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)
author Sage Weil <sage@newdream.net>
Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)
committer GitHub <noreply@github.com>
Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)
diff --cc qa/tasks/cephfs/test_volume_client.py
Simple merge
diff --cc src/pybind/ceph_volume_client.py
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)
committer	GitHub <noreply@github.com>
	Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)
		1	2
qa/tasks/cephfs/test_volume_client.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/ceph_volume_client.py	patch \|	diff1 \|	diff2 \|	blob \| history