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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ef006ae a1aa06b)

author	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 21:06:38 +0000 (14:06 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 21:06:38 +0000 (14:06 -0700)
commit	ae5d294902b2e98f905b607a90062b142d674eeb
tree	6e4ec92a4f3363a10b2428e7ee38e64cf0208363	tree \| snapshot
parent	ef006aeb1a36f54ce4c1af7a20ad937577d240f0	commit \| diff
parent	a1aa06b7fb30e509193e1b1bb7355b5f21aedc82	commit \| diff

Merge pull request #2659 from athanatos/wip-9113

Wip 9113

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

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

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