Merge pull request #11803 from XinzeChi/wip-openpgs

author Sage Weil <sage@redhat.com>

Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)

committer GitHub <noreply@github.com>

Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)
author Sage Weil <sage@redhat.com>
Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)
committer GitHub <noreply@github.com>
Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)
committer	GitHub <noreply@github.com>
	Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history