Merge pull request #38025 from MahatiC/wip-ssd-write

author Jason Dillaman <dillaman@redhat.com>

Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)

committer GitHub <noreply@github.com>

Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)
author Jason Dillaman <dillaman@redhat.com>
Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)
committer GitHub <noreply@github.com>
Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/librbd/cache/pwl/AbstractWriteLog.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)
committer	GitHub <noreply@github.com>
	Thu, 7 Jan 2021 03:45:09 +0000 (22:45 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/cache/pwl/AbstractWriteLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history