Merge pull request #8033 from liewegas/wip-pg-create

author Sage Weil <sage@redhat.com>

Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)

committer Sage Weil <sage@redhat.com>

Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)
author Sage Weil <sage@redhat.com>
Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)
committer Sage Weil <sage@redhat.com>
Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)
committer	Sage Weil <sage@redhat.com>
	Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history