Merge pull request #6900 from liewegas/wip-13988

author Sage Weil <sage@redhat.com>

Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)
author Sage Weil <sage@redhat.com>
Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)
diff --cc qa/workunits/ceph-helpers.sh
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)
		1	2
qa/workunits/ceph-helpers.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history