Merge pull request #21711 from majianpeng/osd-reduce-safetimer

author Kefu Chai <tchaikov@gmail.com>

Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)

committer GitHub <noreply@github.com>

Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)
committer GitHub <noreply@github.com>
Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)
committer	GitHub <noreply@github.com>
	Wed, 30 May 2018 14:11:42 +0000 (22:11 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history