Merge pull request #9084 from dzafman/wip-dz-misc

author Samuel Just <sjust@redhat.com>

Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)

committer Samuel Just <sjust@redhat.com>

Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)
author Samuel Just <sjust@redhat.com>
Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)
committer Samuel Just <sjust@redhat.com>
Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)
committer	Samuel Just <sjust@redhat.com>
	Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history