Merge pull request #21419 from ceph/wip-da-SCA-20180329

author Kefu Chai <tchaikov@gmail.com>

Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)

committer GitHub <noreply@github.com>

Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)
committer GitHub <noreply@github.com>
Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)
committer	GitHub <noreply@github.com>
	Mon, 16 Apr 2018 14:56:42 +0000 (22:56 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history