Merge pull request #7031 from wonzhq/log-monitor-2

author Sage Weil <sage@redhat.com>

Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)

committer Sage Weil <sage@redhat.com>

Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)
author Sage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)
committer Sage Weil <sage@redhat.com>
Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/test/librados/cmd.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)
committer	Sage Weil <sage@redhat.com>
	Sun, 3 Jan 2016 18:19:30 +0000 (13:19 -0500)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados/cmd.cc	patch \|	diff1 \|	diff2 \|	blob \| history