Merge pull request #10513 from stiopaa1/mon_monitor_moveCScrubCScrubTimeout

author Sage Weil <sage@redhat.com>

Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)

committer GitHub <noreply@github.com>

Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)
author Sage Weil <sage@redhat.com>
Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)
committer GitHub <noreply@github.com>
Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)
committer	GitHub <noreply@github.com>
	Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history