Merge pull request #27806 from ashitakasam/add-osd-alarm

author Kefu Chai <kchai@redhat.com>

Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)

committer GitHub <noreply@github.com>

Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)
author Kefu Chai <kchai@redhat.com>
Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)
committer GitHub <noreply@github.com>
Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/mon/PGMap.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)
committer	GitHub <noreply@github.com>
	Thu, 30 May 2019 13:28:54 +0000 (21:28 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history