git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aff20f5 07099ec)

author	Sage Weil <sage@inktank.com>
	Mon, 7 Apr 2014 23:09:40 +0000 (16:09 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 7 Apr 2014 23:09:40 +0000 (16:09 -0700)
commit	aa301b0e49a54bde8c4264bb7c86f9388cd414eb
tree	51653252bc663f6334b4eac7d4304fef159600c9	tree \| snapshot
parent	aff20f5eb249c15ea773600e1288d7bcf3e9e0e9	commit \| diff
parent	07099ecd4c17bccf7fe1ce08031e774a0270fd99	commit \| diff

Merge pull request #1620 from ceph/wip-8003

Wip 8003

Reviewed-by: Sage Weil <sage@inktank.com>

src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.