Merge pull request #32581 from rishabh-d-dave/wip-djf-15070

author Ramana Raja <rraja@redhat.com>

Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)

committer GitHub <noreply@github.com>

Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)
author Ramana Raja <rraja@redhat.com>
Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)
committer GitHub <noreply@github.com>
Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)
diff --cc qa/tasks/cephfs/test_sessionmap.py
Simple merge
diff --cc qa/tasks/cephfs/test_volume_client.py
Simple merge
author	Ramana Raja <rraja@redhat.com>
	Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)
committer	GitHub <noreply@github.com>
	Fri, 11 Sep 2020 18:30:52 +0000 (00:00 +0530)
		1	2
qa/tasks/cephfs/test_sessionmap.py	patch \|	diff1 \|	diff2 \|	blob \| history
qa/tasks/cephfs/test_volume_client.py	patch \|	diff1 \|	diff2 \|	blob \| history