Merge pull request #15466 from smithfarm/wip-19762-jewel

author John Spray <jspray@redhat.com>

Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)

committer GitHub <noreply@github.com>

Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)
author John Spray <jspray@redhat.com>
Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)
committer GitHub <noreply@github.com>
Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)
diff --cc qa/tasks/cephfs/mount.py
Simple merge
diff --cc qa/tasks/cephfs/test_strays.py
Simple merge
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	John Spray <jspray@redhat.com>
	Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)
committer	GitHub <noreply@github.com>
	Wed, 14 Jun 2017 13:35:08 +0000 (09:35 -0400)
		1	2
qa/tasks/cephfs/mount.py	patch \|	diff1 \|	diff2 \|	blob \| history
qa/tasks/cephfs/test_strays.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history