Merge pull request #35026 from changchengx/rwl

author Jason Dillaman <dillaman@redhat.com>

Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)

committer GitHub <noreply@github.com>

Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)
author Jason Dillaman <dillaman@redhat.com>
Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)
committer GitHub <noreply@github.com>
Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)
diff --cc src/librbd/cache/ReplicatedWriteLog.cc
Simple merge
diff --cc src/librbd/cache/rwl/Types.h
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)
committer	GitHub <noreply@github.com>
	Fri, 22 May 2020 17:39:24 +0000 (13:39 -0400)
		1	2
src/librbd/cache/ReplicatedWriteLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/cache/rwl/Types.h	patch \|	diff1 \|	diff2 \|	blob \| history