Merge pull request #12451 from liewegas/wip-osd-on-applied

author Sage Weil <sage@redhat.com>

Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)

committer GitHub <noreply@github.com>

Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)
author Sage Weil <sage@redhat.com>
Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)
committer GitHub <noreply@github.com>
Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)
committer	GitHub <noreply@github.com>
	Thu, 29 Dec 2016 18:43:01 +0000 (12:43 -0600)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history