Merge pull request #2349 from athanatos/wip-9240

author Sage Weil <sage@redhat.com>

Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)

committer Sage Weil <sage@redhat.com>

Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)
author Sage Weil <sage@redhat.com>
Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)
committer Sage Weil <sage@redhat.com>
Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)
committer	Sage Weil <sage@redhat.com>
	Thu, 28 Aug 2014 18:49:08 +0000 (11:49 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history