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: d612a9a 3105034)

author	Sage Weil <sage@inktank.com>
	Fri, 22 Feb 2013 22:16:07 +0000 (14:16 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 22 Feb 2013 22:16:07 +0000 (14:16 -0800)
commit	e03657e45226fc21dfb3257c0d2ee47cf67ee8b1
tree	d0019527c6c380e787c39ffa6f1b76996102a3b2	tree \| snapshot
parent	d612a9abacdde1844725262fbbeba8578b767333	commit \| diff
parent	3105034067dd4afba6ebaa9e30c6782854c9d1ad	commit \| diff

Merge remote-tracking branch 'gh/wip-objecter-fsx'

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

src/osdc/Objecter.h

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