Merge pull request #15214 from gregsfortytwo/wip-19931-snaptrim-pgref

author Gregory Farnum <greg@gregs42.com>

Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)

committer GitHub <noreply@github.com>

Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)
author Gregory Farnum <greg@gregs42.com>
Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)
committer GitHub <noreply@github.com>
Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)
committer	GitHub <noreply@github.com>
	Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history