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: 33150c5 90eb776)

author	Sage Weil <sage@redhat.com>
	Fri, 29 May 2015 21:21:52 +0000 (14:21 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 29 May 2015 21:21:52 +0000 (14:21 -0700)
commit	64096b870960d021ab5001b6a5cf3a999a9abeb7
tree	ea37f75183750347c5c692306612e47946e69564	tree \| snapshot
parent	33150c509d33ca0fad8f19d2d9e43fe7dad57b24	commit \| diff
parent	90eb7768f99ea249952df195a844a3a7c9a59b78	commit \| diff

Merge pull request #4805 from athanatos/wip-11787

Wip 11787

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

src/osd/ReplicatedPG.cc	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.