Merge pull request #5629 from kylinstorage/wip-nocache_skip_promote-v3

author Sage Weil <sage@redhat.com>

Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)
author Sage Weil <sage@redhat.com>
Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 26 Aug 2015 01:48:31 +0000 (21:48 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history