Merge pull request #8156 from liewegas/wip-pg-query

author Sage Weil <sage@redhat.com>

Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)
author Sage Weil <sage@redhat.com>
Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history