Merge pull request #16134 from smithfarm/wip-19340-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)

committer GitHub <noreply@github.com>

Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)
committer GitHub <noreply@github.com>
Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)
committer	GitHub <noreply@github.com>
	Mon, 31 Jul 2017 10:23:08 +0000 (12:23 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history