Merge pull request #9348 from LiumxNL/fix-mksnap

author Sage Weil <sage@redhat.com>

Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)

committer GitHub <noreply@github.com>

Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)
author Sage Weil <sage@redhat.com>
Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)
committer GitHub <noreply@github.com>
Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)
committer	GitHub <noreply@github.com>
	Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history