Merge pull request #28121 from dillaman/wip-39428-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)

committer GitHub <noreply@github.com>

Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)
committer GitHub <noreply@github.com>
Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)
diff --cc src/librbd/io/AioCompletion.cc
Simple merge
diff --cc src/librbd/io/AioCompletion.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)
committer	GitHub <noreply@github.com>
	Wed, 29 May 2019 22:08:52 +0000 (15:08 -0700)
		1	2
src/librbd/io/AioCompletion.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/AioCompletion.h	patch \|	diff1 \|	diff2 \|	blob \| history