Merge pull request #2604 from athanatos/wip-9113

author Sage Weil <sage@redhat.com>

Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)

committer Sage Weil <sage@redhat.com>

Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)
author Sage Weil <sage@redhat.com>
Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)
committer Sage Weil <sage@redhat.com>
Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)
committer	Sage Weil <sage@redhat.com>
	Mon, 29 Sep 2014 21:02:15 +0000 (14:02 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history