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: 929cf29 f021e91)

author	Sage Weil <sage@redhat.com>
	Fri, 21 Aug 2015 21:53:58 +0000 (17:53 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 21 Aug 2015 21:53:58 +0000 (17:53 -0400)
commit	c4aa935f7f71852b35b6f331c6c78b9cc91eea72
tree	26285edae6899dbec3fd5b38cb6f8be70fda3573	tree \| snapshot
parent	929cf29fb3f92391092aa751a43e072175a41129	commit \| diff
parent	f021e91e618c1bb73c57604def584bca468a4ac2	commit \| diff

Merge pull request #5611 from ceph/wip-newstore-misc

osd: final prereq patches for newstore

Reviewed-by: Samuel Just <sjust@redhat.com>

src/common/buffer.cc	diff1 \|	diff2 \|	blob \| history
src/include/buffer.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history

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