Merge pull request #7359 from songbaisen/song9

author Sage Weil <sage@redhat.com>

Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)
author Sage Weil <sage@redhat.com>
Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 17 Mar 2016 22:00:10 +0000 (18:00 -0400)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history