Merge pull request #29227 from ifed01/wip-ifed-slow-ops2-nau

author Yuri Weinstein <yweinste@redhat.com>

Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)

committer GitHub <noreply@github.com>

Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)
committer GitHub <noreply@github.com>
Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)
committer	GitHub <noreply@github.com>
	Tue, 30 Jul 2019 22:19:17 +0000 (15:19 -0700)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history