Merge PR #22908 into master

author Sage Weil <sage@redhat.com>

Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)
author Sage Weil <sage@redhat.com>
Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/libcephfs.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/libcephfs.cc	patch \|	diff1 \|	diff2 \|	blob \| history