Merge pull request #9193 from cxwshawn/wip-tc2-fix

author Sage Weil <sage@redhat.com>

Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)
author Sage Weil <sage@redhat.com>
Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)
diff --cc src/mon/LogMonitor.cc
Simple merge
diff --cc src/mon/LogMonitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)
		1	2
src/mon/LogMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/LogMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history