Merge pull request #27985 from ifed01/wip-ifed-slow-omaps

author Kefu Chai <kchai@redhat.com>

Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)

committer GitHub <noreply@github.com>

Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)
author Kefu Chai <kchai@redhat.com>
Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)
committer GitHub <noreply@github.com>
Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)
committer	GitHub <noreply@github.com>
	Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)
		1	2
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	patch \|	diff1 \|	diff2 \|	blob \| history