Merge pull request #16916 from jcsp/wip-scrub-logging

author Sage Weil <sage@newdream.net>

Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)

committer GitHub <noreply@github.com>

Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)
author Sage Weil <sage@newdream.net>
Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)
committer GitHub <noreply@github.com>
Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)
committer	GitHub <noreply@github.com>
	Wed, 9 Aug 2017 02:27:52 +0000 (21:27 -0500)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history