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: 8e4b5bf 8d0180b)

author	Sage Weil <sage@inktank.com>
	Fri, 13 Dec 2013 18:49:10 +0000 (10:49 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 13 Dec 2013 18:49:10 +0000 (10:49 -0800)
commit	1c0083029ef309c835d1b46b8caae8c412df3a4f
tree	c7365fa618fc8b1492c61d9a00b0f70f01464de3	tree \| snapshot
parent	8e4b5bf8ca8fd0b5468ba1eec8bb274bf5f90093	commit \| diff
parent	8d0180b1b7b48662daef199931efc7f2a6a1c431	commit \| diff

Merge remote-tracking branch 'gh/wip-objecter-full-2'

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

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history

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