Merge remote-tracking branch 'gh/wip-10617-again'

author Sage Weil <sage@redhat.com>

Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)
author Sage Weil <sage@redhat.com>
Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	patch \|	diff1 \|	diff2 \|	blob \| history