Merge pull request #16281 from badone/wip-PG-cluster-log-audit

author Sage Weil <sage@newdream.net>

Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)

committer GitHub <noreply@github.com>

Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)
author Sage Weil <sage@newdream.net>
Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)
committer GitHub <noreply@github.com>
Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)
diff --cc qa/tasks/repair_test.py
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)
committer	GitHub <noreply@github.com>
	Thu, 27 Jul 2017 21:25:30 +0000 (16:25 -0500)
		1	2
qa/tasks/repair_test.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history