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: 4a0c3a6 b6872b2)

author	Sage Weil <sage@inktank.com>
	Fri, 7 Mar 2014 04:06:59 +0000 (20:06 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 7 Mar 2014 04:06:59 +0000 (20:06 -0800)
commit	23db6782bb559ee7c91acca1024a9b1e40c90853
tree	4f867b80906886fbb200677f1c5aabc186f2c4fc	tree \| snapshot
parent	4a0c3a66730b1b35318a18706a90770f23be8c86	commit \| diff
parent	b6872b255c53cefd2992f9e37adc1e8cd56497d9	commit \| diff

Merge pull request #1397 from ceph/wip-7638

ReplicatedPG::trim_object: use old_snaps for rollback

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

src/osd/ReplicatedPG.cc

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