Merge pull request #28597 from markhpc/wip-bs-ind-cache

author Mark Nelson <mnelson@redhat.com>

Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)

committer GitHub <noreply@github.com>

Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)
author Mark Nelson <mnelson@redhat.com>
Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)
committer GitHub <noreply@github.com>
Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/test/objectstore/test_bluestore_types.cc
Simple merge
author	Mark Nelson <mnelson@redhat.com>
	Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)
committer	GitHub <noreply@github.com>
	Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/test_bluestore_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history