Merge pull request #15823 from jdurgin/wip-omap-tp-heartbeat

author Kefu Chai <tchaikov@gmail.com>

Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)

committer GitHub <noreply@github.com>

Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)
committer GitHub <noreply@github.com>
Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)
committer	GitHub <noreply@github.com>
	Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history