Merge pull request #9768 from cxwshawn/wip-tc1-fix

author Sage Weil <sage@redhat.com>

Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)

committer GitHub <noreply@github.com>

Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)
author Sage Weil <sage@redhat.com>
Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)
committer GitHub <noreply@github.com>
Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)
diff --cc src/log/Log.cc
Simple merge
diff --cc src/log/Log.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)
committer	GitHub <noreply@github.com>
	Fri, 4 Nov 2016 18:01:08 +0000 (13:01 -0500)
		1	2
src/log/Log.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/log/Log.h	patch \|	diff1 \|	diff2 \|	blob \| history