Merge pull request #8258 from asheplyakov/bug-12065

author Sage Weil <sage@redhat.com>

Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)
author Sage Weil <sage@redhat.com>
Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)
diff --cc src/mon/MonClient.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)
		1	2
src/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history