Merge pull request #17987 from xiexingguo/wip-kick-recovery-for-degraded-obj

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)

committer GitHub <noreply@github.com>

Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)
committer GitHub <noreply@github.com>
Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)
committer	GitHub <noreply@github.com>
	Thu, 28 Sep 2017 22:48:51 +0000 (15:48 -0700)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history