Merge pull request #35138 from maydaycc/wip-45313

author Jason Dillaman <dillaman@redhat.com>

Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)

committer GitHub <noreply@github.com>

Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)
author Jason Dillaman <dillaman@redhat.com>
Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)
committer GitHub <noreply@github.com>
Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)
diff --cc src/common/options.cc
Simple merge
diff --cc src/librbd/ImageCtx.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)
committer	GitHub <noreply@github.com>
	Fri, 29 May 2020 20:32:05 +0000 (16:32 -0400)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/ImageCtx.cc	patch \|	diff1 \|	diff2 \|	blob \| history