Merge pull request #12148 from tchaikov/wip-scan-build-fixes

author Sage Weil <sage@redhat.com>

Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)

committer GitHub <noreply@github.com>

Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)
author Sage Weil <sage@redhat.com>
Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)
committer GitHub <noreply@github.com>
Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)
diff --cc src/common/hobject.cc
Simple merge
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)
committer	GitHub <noreply@github.com>
	Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)
		1	2
src/common/hobject.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history