Merge pull request #14596 from gregsfortytwo/wip-17916-divergent

author Gregory Farnum <greg@gregs42.com>

Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)

committer GitHub <noreply@github.com>

Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
author Gregory Farnum <greg@gregs42.com>
Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
committer GitHub <noreply@github.com>
Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PGLog.cc
Simple merge
diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
committer	GitHub <noreply@github.com>
	Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	patch \|	diff1 \|	diff2 \|	blob \| history