Merge pull request #3767 from athanatos/wip-10881

author Sage Weil <sage@redhat.com>

Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)

committer Sage Weil <sage@redhat.com>

Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)
author Sage Weil <sage@redhat.com>
Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)
committer Sage Weil <sage@redhat.com>
Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)
committer	Sage Weil <sage@redhat.com>
	Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history