Merge pull request #7363 from cxwshawn/mon-sync-fix

author Sage Weil <sage@redhat.com>

Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)

committer Sage Weil <sage@redhat.com>

Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)
author Sage Weil <sage@redhat.com>
Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)
committer Sage Weil <sage@redhat.com>
Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)
diff --cc src/mon/ConfigKeyService.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)
committer	Sage Weil <sage@redhat.com>
	Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)
		1	2
src/mon/ConfigKeyService.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history