Merge pull request #19811 from neha-ojha/wip-async-recovery

author Josh Durgin <jdurgin@redhat.com>

Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)

committer GitHub <noreply@github.com>

Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)
author Josh Durgin <jdurgin@redhat.com>
Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)
committer GitHub <noreply@github.com>
Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)
committer	GitHub <noreply@github.com>
	Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history