Merge pull request #34796 from smithfarm/wip-45045-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)

committer GitHub <noreply@github.com>

Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)
committer GitHub <noreply@github.com>
Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)
diff --cc src/os/bluestore/BlueFS.cc
Simple merge
diff --cc src/os/bluestore/BlueFS.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)
committer	GitHub <noreply@github.com>
	Mon, 4 May 2020 20:42:55 +0000 (13:42 -0700)
		1	2
src/os/bluestore/BlueFS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueFS.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history