Merge pull request #16446 from xiexingguo/wip-destroyed

author Kefu Chai <tchaikov@gmail.com>

Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)

committer GitHub <noreply@github.com>

Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)
committer GitHub <noreply@github.com>
Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)
committer	GitHub <noreply@github.com>
	Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history